Merge cherrypicks of [2844228, 2844486, 2844487] into studio-3.0-release

Change-Id: Ic79a3d74bd69e90699064263c753343025ab97cf