Merge cherrypicks of [11549508, 11549509] into studio-3.7-release

Change-Id: I6b69becf38c0ced50dac2602b3cf7d96d5c8d042