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

Change-Id: I9671e56d1479d60ff0f44d5aa0de5448ae3a6a61