Merge cherrypicks of ['googleplex-android-review.googlesource.com/37111648', 'googleplex-android-review.googlesource.com/37181785', 'googleplex-android-review.googlesource.com/37822361', 'googleplex-android-review.googlesource.com/37777658', 'googleplex-android-review.googlesource.com/37885304', 'googleplex-android-review.googlesource.com/37766658', 'googleplex-android-review.googlesource.com/37963521', 'googleplex-android-review.googlesource.com/38030884', 'googleplex-android-review.googlesource.com/38026993', 'googleplex-android-review.googlesource.com/38196240', 'googleplex-android-review.googlesource.com/38219111', 'googleplex-android-review.googlesource.com/38184450', 'googleplex-android-review.googlesource.com/38138166', 'googleplex-android-review.googlesource.com/38305732', 'googleplex-android-review.googlesource.com/38624281', 'googleplex-android-review.googlesource.com/38480229', 'googleplex-android-review.googlesource.com/38183774', 'googleplex-android-review.googlesource.com/36191167', 'googleplex-android-review.googlesource.com/38817480', 'googleplex-android-review.googlesource.com/39130913', 'googleplex-android-review.googlesource.com/39147759', 'googleplex-android-review.googlesource.com/39177314', 'googleplex-android-review.googlesource.com/38638509'] into 25Q2-release.

Change-Id: Iab8ae2c4bfb3d56505c6105bd6eafd230b917216