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

Change-Id: I757e2f7a8cd7ec9404717e192c5d7e49b53ed3dc