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

Change-Id: I1ab3d932a0cc64774a6a771d49fbe2aa2a472cf4