tree ecdfa93eda8025aac18e67bb356db439bbee6505
parent 86c625ce816140eb7be31fe8b80a9d62a478ef60
parent d28eb4a852d905de0ed1434e0d743514e59e9aee
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1711496333 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1711496333 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26570364', 'googleplex-android-review.googlesource.com/26587909'] into 24Q2-release.

Change-Id: I9e393c9b9df64bb7cdbd0c733170acada1f17428