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

Change-Id: I930c21f6dee1f1e80a3d06b39970888f7dc7fee1