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

Change-Id: Ic31eabcf5c97e7d089ac5fbe1b4cf12e040ea16b