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

Change-Id: Id80eb91edce1485963be59d428658fadd6912aaa