Merge cherrypicks of ['googleplex-android-review.googlesource.com/26882300'] into 24Q2-release.

Change-Id: Ib6c2201b1a5592507aa9d7b3844ae79e391389ed