tree 16478d73ce450495cbf1572f65e4cd02fd3b47c5
parent 0697a0f7270da8ed7fbd18360d83dd5d925c52f6
parent cf937d5ddf1710fcd4e680971008190ab2beb4ef
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1729205627 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1729205627 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29780655', 'googleplex-android-review.googlesource.com/29908762'] into 24Q4-release.

Change-Id: I23347777c43e365dc1a2c7e8dda4bec3661a639e