Merge 'jetbrains-master-mirror' into studio-master-dev
am: 1608370faa

Change-Id: I50882026c6e69a00c6975f1455dc68ffa13b67be