Merge cherrypicks of ['googleplex-android-review.googlesource.com/28157898', 'googleplex-android-review.googlesource.com/28189571', 'googleplex-android-review.googlesource.com/28256128', 'googleplex-android-review.googlesource.com/28410131'] into 24Q3-release.

Change-Id: I7294f657ce362469f6b14b4dbedb0e56eeeadb15