tree 7c0c86eae3b37ce8c4bceec2137ef4a160325c67
parent 42c7f1aea2d8871a355c18a2ef0c1f8e317ce0df
parent 56fe5328c37390cd0da2eb80e15fc8990e0110f2
author android-build-team Robot <android-build-team-robot@google.com> 1585683197 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1585683197 +0000

Merge cherrypicks of [10908792, 10908752] into rvc-release

Change-Id: I4357262bff7d45505a84c6bbea97b57bdd32ba87