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

Change-Id: I1aaaba2d463d0b12e170a745188a96a2a96cc875