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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26226894', 'googleplex-android-review.googlesource.com/27105055', 'googleplex-android-review.googlesource.com/27791178', 'googleplex-android-review.googlesource.com/27802719'] into 24Q2-release.

Change-Id: I8a8da3e50ec7003e0574801f4f205b39e6e73d03