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

Change-Id: I5d5fb80e135b78ae751c57aa1a2e543cb223071a