Merge cherrypicks of ['googleplex-android-review.googlesource.com/32753793', 'googleplex-android-review.googlesource.com/32754356', 'googleplex-android-review.googlesource.com/32627908'] into 25Q2-release.

Change-Id: I4f68886629a85d4c404dfc7e276b1ab2363c50b4