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

Change-Id: Iecf9e00d122f9298021bbfc92548637a9371d077