tree d5a19c65300c5b3e141c23c890ec32dede715737
parent 18de09e136a339f927d71d1781695ba6d6ff7ff0
parent c93defe68ee5797294cbd087731d0ec52c6834af
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1643410240 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1643410240 +0000

Merge cherrypicks of [16736103, 16736104] into sc-v2-release.

Change-Id: I092ca9f4a4c0c8c7968db29034a8476c2f82a62e