tree c6160fbd94b6268cfbae0e7c4a7cc7a20f188845
parent bf0c9e2efd435bda2162ea37c3c0e5e50f23ccc5
parent 916a7f681d13733ccabcde731f0f2b2b98f76971
author android-build-team Robot <android-build-team-robot@google.com> 1584574330 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1584574330 +0000

Merge cherrypicks of [10735612, 10734887, 10739937] into rvc-release

Change-Id: I6b76b96cb1f8a0f9fbc605d548442aeac41a931f