tree 0fce9b6d45f4987066d3a188817d4e460990e854
parent c1a08efbe8f7281d22c9702b635a6e10ccb69ef2
parent d58ceb699556c16ca3e0aba6824d988fa0d2a4fa
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1643410239 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1643410239 +0000

Merge cherrypicks of [16738003, 16738004] into sc-v2-release.

Change-Id: Iba216055b554c0476eee51ad6f867d0863953ccf