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

Change-Id: I3b859d5fd3208e19332b571b4ea333839d6c78bc