Merge cherrypicks of ['googleplex-android-review.googlesource.com/31435478'] into 25Q1-release. Change-Id: I75d7b9b7bafac54487e9a5ae4f4d86890276cb9e