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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26621463', 'googleplex-android-review.googlesource.com/26681774', 'googleplex-android-review.googlesource.com/26741740', 'googleplex-android-review.googlesource.com/26837538', 'googleplex-android-review.googlesource.com/26875227', 'googleplex-android-review.googlesource.com/26905538', 'googleplex-android-review.googlesource.com/27015418'] into 24Q2-release.

Change-Id: I1853d6149b716bba6624a0cea2cba63f91b7dbdb