tree 846e5096c971dc73ab63bac7a292aad5111ca236
parent 19a2928d5ca62a494847d82b3608b71baaed7354
parent f0991d9385d8a949b03d7d1d439a1f2f0c33c63c
author android-build-team Robot <android-build-team-robot@google.com> 1615953344 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1615953344 +0000

Merge cherrypicks of [13894455, 13894456] into rvc-qpr2-release

Change-Id: I82e8375abd194f2a1485410944a68404d64d66da