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

Change-Id: Ib4ad10e62a3c9ddd5abeb014cf85d40e65ba3503