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

Change-Id: I2fdcb31ba8fb102af0113644a60efbdf6320d35b