tree caede0ce5eae2bab8a66042d51e1850fb3124af7
parent 4130091e3bfd630b7ea34e8346c0a8a81c5676fd
parent 80666d0d41830a22241cc6779ded400d13ae6768
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1643410238 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1643410238 +0000

Merge cherrypicks of [16736788, 16736789] into sc-v2-release.

Change-Id: I005677f1edf91dcbc3d85c4f7998bf7b4ac6f6c5