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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27940383', 'googleplex-android-review.googlesource.com/27975410', 'googleplex-android-review.googlesource.com/27950609', 'googleplex-android-review.googlesource.com/28051259', 'googleplex-android-review.googlesource.com/28156919', 'googleplex-android-review.googlesource.com/28153099', 'googleplex-android-review.googlesource.com/28351960', 'googleplex-android-review.googlesource.com/28352745'] into 24Q3-release.

Change-Id: I9d375e0311f7481a068b7968c08d95ee3969f949