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

Change-Id: Idca7a4be1dfa24dcb81cbeb5ce114b828497cbf0