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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/32498740', 'googleplex-android-review.googlesource.com/26968615', 'googleplex-android-review.googlesource.com/32771450', 'googleplex-android-review.googlesource.com/32774469', 'googleplex-android-review.googlesource.com/32773188'] into 25Q2-release.

Change-Id: I73b4a9cbe20c661045f5f32c57afa9e5ebe2675e