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

Change-Id: I0a9d7cfb16a54ee0090162d421107f7ab5554c1c