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

Change-Id: I03954d2744a3d636476d368eca26aed8f123f33e