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

Change-Id: Idf88b0930b8f818c00f28f35e3fa41569245ba6d