tree a02afd32e3cab59813cfe19c4a3e87991a68f01e
parent 9a4ca1540ebdcfdf1084196e7494194ca0335b5c
parent 6ecdcbaaa183d374f29a17ad881292158f724aaa
author android-build-team Robot <android-build-team-robot@google.com> 1582332668 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1582332668 +0000

Merge cherrypicks of [10384223, 10378222] into rvc-release

Change-Id: I64466d813796501a11cb853f337aa1e908c320db