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

Change-Id: I51417d7b97a92a99f42b43b9ee3287d59acd2340