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

Change-Id: If32881dc7dcb26b04c78b4d8ad0185851277cd39