Merge cherrypicks of ['googleplex-android-review.googlesource.com/40098252', 'googleplex-android-review.googlesource.com/40240698', 'googleplex-android-review.googlesource.com/40300213', 'googleplex-android-review.googlesource.com/40481226', 'googleplex-android-review.googlesource.com/40512486', 'googleplex-android-review.googlesource.com/40632066', 'googleplex-android-review.googlesource.com/40631307', 'googleplex-android-review.googlesource.com/40539293', 'googleplex-android-review.googlesource.com/40653173', 'googleplex-android-review.googlesource.com/40823527', 'googleplex-android-review.googlesource.com/40258458'] into 25Q2-release.

Change-Id: I4853d7e4044cf9fb2a7fef2f23573a4da7d04e3a