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

Change-Id: Id9abfda0bcdbdd49317eda8a42ecbd8273ef6e62