Merge cherrypicks of [12406219, 12405497] into studio-4.1-release

Change-Id: Idc5872447a8e7a82bb6eef6e9f2909fe66d39174