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

Change-Id: I902dbdaba46fd26a5ceca1c1b0690053d17ee987