Merge 'jetbrains-master-mirror' into studio-master-dev
am: 45faba88ae

Change-Id: I0d47c641db61ac597797bcde4b11f97268b48507