tree 71cc1f7b225036f139b7956666bc3a884aaa5167
parent 66429c3f410b7ef9f8d8df0dc0017e51cc4265f2
parent 050e00a81d3903aca018ff18ad177904049a2c9b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1645589556 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1645589556 +0000

Merge cherrypicks of [16622627, 16790556] into sc-d2-release.

Change-Id: Iea899cc8a3b77c6827d7091d81271412a867fe54