Merge cherrypicks of [12960543, 12960557] into studio-4.1-release

Change-Id: I6a854f408c339da24aa9b15e67fe861461840df6