Merge 'jetbrains-master-mirror' into studio-master-dev
am: 07a190d0f2

Change-Id: Iec74dce6c57c4d0e10381a16e5cd79adbbe8d11a