tree 9d3d0f498b0ec18c69f89abd0c9653d8953ce8d9
parent c8babe25665c6d3b195778835ab7d7d86498a9bb
parent bb71218fb1f8a7c734b27d098d857cf533e0806b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1704851099 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1704851099 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25815580', 'googleplex-android-review.googlesource.com/25815747'] into udc-d2-release.

Change-Id: I037da525899b089b2e4e393e9e1206ef3d5ce2c9