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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27907340', 'googleplex-android-review.googlesource.com/28050267', 'googleplex-android-review.googlesource.com/28238316', 'googleplex-android-review.googlesource.com/28239050', 'googleplex-android-review.googlesource.com/28239051', 'googleplex-android-review.googlesource.com/28239053', 'googleplex-android-review.googlesource.com/28239476', 'googleplex-android-review.googlesource.com/28239477', 'googleplex-android-review.googlesource.com/28239514', 'googleplex-android-review.googlesource.com/28240474', 'googleplex-android-review.googlesource.com/28240650', 'googleplex-android-review.googlesource.com/28240651', 'googleplex-android-review.googlesource.com/28240788', 'googleplex-android-review.googlesource.com/28241065', 'googleplex-android-review.googlesource.com/28241074', 'googleplex-android-review.googlesource.com/28241223', 'googleplex-android-review.googlesource.com/28241246', 'googleplex-android-review.googlesource.com/28241265', 'googleplex-android-review.googlesource.com/28241302', 'googleplex-android-review.googlesource.com/28241321', 'googleplex-android-review.googlesource.com/28241356', 'googleplex-android-review.googlesource.com/28241361'] into 24Q3-release.

Change-Id: I425cf36854631e0b651e7173c3f165557d855aa4