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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28613949', 'googleplex-android-review.googlesource.com/28599620', 'googleplex-android-review.googlesource.com/28601084', 'googleplex-android-review.googlesource.com/28601161', 'googleplex-android-review.googlesource.com/28601164', 'googleplex-android-review.googlesource.com/28601167', 'googleplex-android-review.googlesource.com/28601170', 'googleplex-android-review.googlesource.com/28601171', 'googleplex-android-review.googlesource.com/28601172', 'googleplex-android-review.googlesource.com/28601343', 'googleplex-android-review.googlesource.com/28616453', 'googleplex-android-review.googlesource.com/28616623', 'googleplex-android-review.googlesource.com/28617514'] into 24Q3-release.

Change-Id: Ibfd4b25b02589d0605c590298a8b762bc1ae885d