Merge cherrypicks of ['googleplex-android-review.googlesource.com/28156922', 'googleplex-android-review.googlesource.com/28189884', 'googleplex-android-review.googlesource.com/28256077', 'googleplex-android-review.googlesource.com/28397176'] into 24Q3-release.

Change-Id: I3a0af64b1043c6dc4fa657d0f2450854b535e3ee