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

Change-Id: I221080236fa33a7200587cf74f130d2711dc45a5