Merge \'jetbrains-master-mirror\' into studio-master-dev
am: 7c0f138cfd

* commit '7c0f138cfd3eae2d1a0c5623bb6917cfe0c14368':

Change-Id: I858a8b3554f984fb299bf11779f3dbd826d97c38