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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26459294', 'googleplex-android-review.googlesource.com/26457742', 'googleplex-android-review.googlesource.com/26620899'] into 24Q2-release.

Change-Id: I5f559c1e1d797a855ae09c60043b5c5edcad3654