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

Change-Id: Iae17a95aabc1bbeea4eedd04f7ffa70c0d31620e