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

Change-Id: I07c6d31c506f7289b91f4bd26fecec4aeef7bf10