Merge cherrypicks of ['googleplex-android-review.googlesource.com/27588357', 'googleplex-android-review.googlesource.com/27586831', 'googleplex-android-review.googlesource.com/26823864', 'googleplex-android-review.googlesource.com/28319512', 'googleplex-android-review.googlesource.com/28320529'] into 24Q3-release.

Change-Id: Ibf841eb6c51608271f07bf930603a882c8ad46c6