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

Change-Id: I150a0a8bb529aa384002fb706d6d421e6ef5f8eb