tree d8e5f327c9eefc519f791797d4884f89861fc6a1
parent d7affd480afac66e360c7a6887adb4ce0a4665db
parent 63e872e1824747473816079678d4832a827e545e
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1644453734 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1644453734 +0000

Merge cherrypicks of [16790769, 16820286] into sc-v2-release.

Change-Id: I91f527f5364cefdffa92f54718959602e0fa4d36