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

Change-Id: I6e3a1568e648d8428740edcecc35546397753489