Merge cherrypicks of ['googleplex-android-review.googlesource.com/30996379', 'googleplex-android-review.googlesource.com/31042170', 'googleplex-android-review.googlesource.com/31035581'] into 25Q1-release.

Change-Id: I5448c3c77cc865c0f49c660137654cb895ec4743