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

Change-Id: Ice41569ba8d0832fb4ae4b1fa9012def82e31728