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

Change-Id: I13de870299fc00dc452becddd065ef3e7a96abe1