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

Change-Id: If76f8de3df6e0bcf0b91aca38414c5a403eae1c7