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

Change-Id: I5ba631b05bbc59dfdb871231ae773eab43e48815