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

Change-Id: I86151df4681cf712e7ccc75cd977c54c946b5b9c