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

Change-Id: Id700cde7b1db579e443ed1c1f959f4dc473a95ae