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

Change-Id: I9fcf7f342b42971840a22ee67f95929cde051ac6