Merge cherrypicks of ['googleplex-android-review.googlesource.com/30892034', 'googleplex-android-review.googlesource.com/31104079', 'googleplex-android-review.googlesource.com/31104385'] into 25Q1-release.

Change-Id: I212eac9710c8f75d3e65f23225fab7bd62cd2338