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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27792314', 'googleplex-android-review.googlesource.com/27949323', 'googleplex-android-review.googlesource.com/27479256', 'googleplex-android-review.googlesource.com/28129430', 'googleplex-android-review.googlesource.com/28174177', 'googleplex-android-review.googlesource.com/28212261', 'googleplex-android-review.googlesource.com/28137955'] into 24Q3-release.

Change-Id: I1791de0d93ba8b41b1bb42f6ff6272df05f9850d