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

Change-Id: I65bbd796fc4245362c619ede9b5646e67ba8a4a4