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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/32805538', 'googleplex-android-review.googlesource.com/32837056', 'googleplex-android-review.googlesource.com/32837463', 'googleplex-android-review.googlesource.com/32837650', 'googleplex-android-review.googlesource.com/32837464'] into 25Q2-release.

Change-Id: I4d4a35ffb0450990b33c8a1e2792d1be4c66ed60