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

Change-Id: I1627826bdda8d1de4823d89ef39c5b95b90d04d0