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

Change-Id: If0bed40e379de3c888b5bf9c6c0e84547c25491f