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

Change-Id: I5a17d9088cecad6b6a30e7559da022eff7c8b567