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

Change-Id: I49421cc340873551d0771d9f71e59d1d00a02763