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

Change-Id: I27fd5fe92e075c77e758a25de09f80e8670c404f