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

Change-Id: I8c841b7ab41ebe11d36ad4fab6aa8060b728e2b9