tree d357149816747c2cee788e2b33411f1b0920a9db
parent a63bc4e751e90f86bc111dd59dd0dec5eccef36f
parent daf694c5b48c31a88a7e31e344c8640ab89c743f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1659885972 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1659885972 +0000

Merge cherrypicks of [19517836, 19517837] into tm-d1-release.

Change-Id: I881441a3d7f27972b16af4f2a0d8bae9e864d846