Merge cherrypicks of ['googleplex-android-review.googlesource.com/34088452', 'googleplex-android-review.googlesource.com/33983681', 'googleplex-android-review.googlesource.com/34101216', 'googleplex-android-review.googlesource.com/34171793'] into 25Q3-release.

Change-Id: Iaf54d2b7fdb75a0bf583dbd7ae4eee185b231641