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

Change-Id: Ia6a9ea09ee3fa07ac349fb15f907ed9b401ac313