tree 361a85f87c4dced8d1ea809170a386032d10ae39
parent 27fef17b84780c75787f31ef64bf926eae4bbd64
parent 70b6d10c3de3e211f3ec6d1a5b559c6a4c660218
author android-build-team Robot <android-build-team-robot@google.com> 1614735451 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1614735451 +0000

Merge cherrypicks of [13746220, 13745437] into rvc-qpr2-release

Change-Id: I1daaa8cd440c853927dcbd5de7b98cf090a83cb0