tree 2e8a64993320115a8dc50d6a51dda4fe90feeccb
parent e81759e908440868bff03167d08d43127fec38a3
parent 61fbf3b3a03bbbd095c1b3453fde9a31924ab702
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1642552943 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1642552943 +0000

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

Change-Id: Ic530f9b9d8d25adc37117eedc475f2aee625f820