tree a282fa8bc795d1e9960f5be47c43915b9f5a7056
parent 73d1c56fba092ccbcf9aa236d656af6631fd6e7c
parent f53f371806d307845e0c35fa1da31b1cd2228bc4
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1643182019 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1643182019 +0000

Merge cherrypicks of [16718400] into sc-d2-release.

Change-Id: I199c886a26c85b51d769f9f3006bd60054df2e3b