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

Change-Id: I3838df64eca72335ee355854dad5878815762a71