This commit is needed for the following commit. There we will restore the compatibility API with Android IDEA plugin