tree 11747358e9b25fd092f62378e782f173274fdbe8
parent 421283d3e148a6825611f79b75f603ccacd78c0a
parent 31d0818453633adcc10e231e0432b84376a8c9bf
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1643410237 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1643410237 +0000

Merge cherrypicks of [16737147, 16298079] into sc-v2-release.

Change-Id: Ibfee9b09eda7084e403fac64008668770b6b4922