Merge cherrypicks of ['googleplex-android-review.googlesource.com/32832580', 'googleplex-android-review.googlesource.com/32873857', 'googleplex-android-review.googlesource.com/32873924'] into 25Q2-release. Change-Id: Iae1050678c0e16c1b561ac6fa798d082d964eeda