Merge 'jetbrains-master-mirror' into studio-master-dev
am: ad06f38619

Change-Id: Idd8914d54957955224c27bdc89bbfe91c848a9a0