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

Change-Id: I8bf7206d0aa318dea651a00159a9b41dec51a1f4