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

Change-Id: I070373deef480208d1b442fa0e1b3a169904f853