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

Change-Id: Ib7e226c6c939e685c8d0d038ed3c8d36e47fbd60