Merge cherrypicks of ['googleplex-android-review.googlesource.com/31390730'] into 25Q1-release.

Change-Id: I4dbb9d861c1c39bd52c23392ca156e45b2919985