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

Change-Id: I2bcd54ea3c3e81b1603233ad48d5659320a46cea