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

Change-Id: I0c4aa2817e7afc743ed121877092bb02a697277a