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

Change-Id: Ia6f9b02e7ea39dbdde46066b9e37b301515fbc1b