Merge cherrypicks of ['googleplex-android-review.googlesource.com/32835485', 'googleplex-android-review.googlesource.com/32836107', 'googleplex-android-review.googlesource.com/32836113'] into 25Q2-release.

Change-Id: I8c3ca8cef3574248052d0cf5a25211a2afc5767b