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

Change-Id: I43d12b609faf1abfdd342559c76737a831ba8ae6