tree 29a08c6dd02a91f2f92381a1cf9799cf5144436b
parent da7f6052bfd5d9d8778ad28ae923a8317f114a97
parent dd0d78f0ead984881caee291751226001f92587e
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1639526729 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1639526729 +0000

Merge cherrypicks of [16379730] into sc-qpr1-release.

Change-Id: I43a6c61c67f4e4c0fe3ca184dfd4e597462a9bb0