Merge cherrypicks of ['googleplex-android-review.googlesource.com/34299715', 'googleplex-android-review.googlesource.com/34389658', 'googleplex-android-review.googlesource.com/34391739', 'googleplex-android-review.googlesource.com/34392137', 'googleplex-android-review.googlesource.com/34392239', 'googleplex-android-review.googlesource.com/34392242', 'googleplex-android-review.googlesource.com/34392400', 'googleplex-android-review.googlesource.com/34393757', 'googleplex-android-review.googlesource.com/34393923', 'googleplex-android-review.googlesource.com/34400078'] into 25Q3-release.
Change-Id: I01d95795a9bcdcbdedead72c1a6ee15bbe9c6368