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

Change-Id: Icefa8c6596ee732fb44563df73f06cacf3bb0e0c