tree 06a3856af55cd958004391adb819e9bf6a520ec5
parent 707dd9429727b5057035f8a778e9ab4f2917d724
parent 1faffe58ea78f18978b30ebb20633a6632dae105
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1729205905 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1729205905 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29779920', 'googleplex-android-review.googlesource.com/29908258'] into 25D4-release.

Change-Id: Ic1d64ebe714ca176d86d03c022ca56deb6e15215