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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25829021', 'googleplex-android-review.googlesource.com/25829022', 'googleplex-android-review.googlesource.com/25829023', 'googleplex-android-review.googlesource.com/25829024', 'googleplex-android-review.googlesource.com/25829500', 'googleplex-android-review.googlesource.com/25829501', 'googleplex-android-review.googlesource.com/25829502', 'googleplex-android-review.googlesource.com/25829503', 'googleplex-android-review.googlesource.com/25829504', 'googleplex-android-review.googlesource.com/25829505', 'googleplex-android-review.googlesource.com/25830514', 'googleplex-android-review.googlesource.com/25830842'] into 24Q1-release.

Change-Id: Iea3cdd3bf03fc32458ed4e55504a4b84db643a46