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

Change-Id: I200b4370f13a419af976e25610a37884e1eed2c5