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

Change-Id: Ib9f35190f5b8159b845be123a157b479eeea28e2