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

Change-Id: I45509bab117fa61b82d3446d81acb53ddeea05d8