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

Change-Id: I069a9491aa159b9f6cac38e689744d0bf54b97fa