Merge cherrypicks of ['googleplex-android-review.googlesource.com/33628778', 'googleplex-android-review.googlesource.com/34153374', 'googleplex-android-review.googlesource.com/34153337', 'googleplex-android-review.googlesource.com/34154057', 'googleplex-android-review.googlesource.com/33856814'] into 25Q2-release.

Change-Id: I5073cea55c7ad02c64d5379830ff80481ebed073