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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27886457', 'googleplex-android-review.googlesource.com/27873775', 'googleplex-android-review.googlesource.com/27873355', 'googleplex-android-review.googlesource.com/27954786', 'googleplex-android-review.googlesource.com/28014307'] into 24Q3-release.

Change-Id: Id71fd1069c3a07783709e192cb81570f24494e31