Merge cherrypicks of [12986203, 12985811] into studio-4.1-release

Change-Id: If35f32983cf3f28f747a15248e962e61d043bbf9