Merge cherrypicks of ['googleplex-android-review.googlesource.com/29773030'] into 24Q4-release. Change-Id: I9d54790eb1b73b75eed71eafc51831159fd03f8e