Merge cherrypicks of ['googleplex-android-review.googlesource.com/27584896', 'googleplex-android-review.googlesource.com/27585950', 'googleplex-android-review.googlesource.com/26823303', 'googleplex-android-review.googlesource.com/28295845', 'googleplex-android-review.googlesource.com/28295692'] into 24Q3-release.

Change-Id: Ibeaf742498a91fcdd2e4121df66059ab4de5bd86