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

Change-Id: Ic6aa0698c9bf8696cafea063f427a0f9ecbc68a3