Merge cherrypicks of ['googleplex-android-review.googlesource.com/35237969', 'googleplex-android-review.googlesource.com/35844779', 'googleplex-android-review.googlesource.com/36008883'] into 25Q2-release.

Change-Id: Ie5dbcfc96fdcf84f7c7980d54e49856867d9c7ae