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

Change-Id: I9b498fbca010a5a5f96f357eea18329d2499ee65