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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25753314', 'googleplex-android-review.googlesource.com/25791015', 'googleplex-android-review.googlesource.com/25704204', 'googleplex-android-review.googlesource.com/25939141', 'googleplex-android-review.googlesource.com/25851459'] into 24Q1-release.

Change-Id: Ib6ba7a1407c3bcbac7fc1598c0948daa437dbb3b