Merge cherrypicks of ['googleplex-android-review.googlesource.com/27588147', 'googleplex-android-review.googlesource.com/27588342', 'googleplex-android-review.googlesource.com/27628687', 'googleplex-android-review.googlesource.com/27629965', 'googleplex-android-review.googlesource.com/27695359', 'googleplex-android-review.googlesource.com/27695361', 'googleplex-android-review.googlesource.com/27695492', 'googleplex-android-review.googlesource.com/27697196', 'googleplex-android-review.googlesource.com/27697315', 'googleplex-android-review.googlesource.com/27697199', 'googleplex-android-review.googlesource.com/26819775', 'googleplex-android-review.googlesource.com/28321485', 'googleplex-android-review.googlesource.com/28319879', 'googleplex-android-review.googlesource.com/28321741', 'googleplex-android-review.googlesource.com/28321742', 'googleplex-android-review.googlesource.com/28321248', 'googleplex-android-review.googlesource.com/28321785'] into 24Q3-release.

Change-Id: Ie9de6a44f6af346c760ee053a7017f7bd9648941