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

Change-Id: I866166e99a8beb37091322ef01037595f9bf4369