Merge cherrypicks of ['googleplex-android-review.googlesource.com/34092590',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/34092590', 'googleplex-android-review.googlesource.com/34110855', 'googleplex-android-review.googlesource.com/34229573', 'googleplex-android-review.googlesource.com/34239773', 'googleplex-android-review.googlesource.com/34242093', 'googleplex-android-review.googlesource.com/34109493', 'googleplex-android-review.googlesource.com/34110430', 'googleplex-android-review.googlesource.com/34251824'] into 25Q3-release.

Change-Id: If7da0d110a24eaec3d5c148494c47ca00ec6cc31