tree 13338d96f4138cbad19cc5d903b8fe8379ebf048
parent 30b163289fcea6ec3b7e15cd1e71f471c92ec3a9
parent dd7e14491b27ea78bd62520bd0086a173fbb0d08
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1737589396 -0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1737589396 -0800

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31389457', 'googleplex-android-review.googlesource.com/31391237'] into 25Q1-release.

Change-Id: I0036d1e0fb908888b8dd7db42e074b58893b5d82