Merge cherrypicks of [12526842] into studio-4.1-release

Change-Id: Iaff18dac0847676ab712261ee5f71588d55fc7e4