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

Change-Id: I8c3c2a6fe033e4c539522aab1e568ad27cc2e531