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

Change-Id: I9d09ea77425cac35e7229ad6059b7265d250446b