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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27914207', 'googleplex-android-review.googlesource.com/28034703', 'googleplex-android-review.googlesource.com/28037933', 'googleplex-android-review.googlesource.com/28040051', 'googleplex-android-review.googlesource.com/28016800', 'googleplex-android-review.googlesource.com/27976286', 'googleplex-android-review.googlesource.com/28051456'] into 24Q3-release.

Change-Id: I76ba98e5b6e29bd5dc5dacbc87ac442ca320df3e