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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26461184', 'googleplex-android-review.googlesource.com/26493711', 'googleplex-android-review.googlesource.com/26515897', 'googleplex-android-review.googlesource.com/26540827', 'googleplex-android-review.googlesource.com/26601516'] into 24Q2-release.

Change-Id: I1ea51c22ff5a67a470a8e01af22936d36b532f1e