tree 123c78e6251240bc56731b1b999dfec14b1051cd
parent f8f00629d484c70309df83210afeaee321654587
parent 2ed08261136fe59edd04af2b186bf0413aea108f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1644880443 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1644880443 +0000

Merge cherrypicks of [16816308, 16630867] into sc-v2-release.

Change-Id: I5817aa8c870e5e8f2849644bdd966813d55960e3