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

Change-Id: If33fe753ea6825244bd1fe3b2c3d8acb436bdf41