tree 6bff8c3d5e51230c3616a189bdd97b0b8a7024e2
parent 5522e522a366aed1db2a00bdee1e0fdb80d6f799
parent 720268881ee24f0c478f56efed0a151721e49550
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1657158545 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1657158545 +0000

Merge cherrypicks of [16816453, 17570067] into sc-d2-release.

Change-Id: Iea54cbabb16aa09e085485ad87d344008ffe5a6f