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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27953195', 'googleplex-android-review.googlesource.com/28003910', 'googleplex-android-review.googlesource.com/28218141', 'googleplex-android-review.googlesource.com/28211352', 'googleplex-android-review.googlesource.com/28337565', 'googleplex-android-review.googlesource.com/28342320'] into 24Q3-release.

Change-Id: I2413d66c10a982965325f97c5229f18853e5bb10