Merge cherrypicks of ['googleplex-android-review.googlesource.com/27881172', 'googleplex-android-review.googlesource.com/28359704', 'googleplex-android-review.googlesource.com/28598475'] into 24Q3-release.

Change-Id: I2215cc9e89b78014f2c90b38bd03e1a058ad6bd7