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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29613539', 'googleplex-android-review.googlesource.com/29616258', 'googleplex-android-review.googlesource.com/29677529', 'googleplex-android-review.googlesource.com/29669826', 'googleplex-android-review.googlesource.com/29732966', 'googleplex-android-review.googlesource.com/29733285'] into 24Q4-release.

Change-Id: I68b4db9f996cc0d7a80e6cdbb2ea1f3d6b68337c