Merge cherrypicks of ['googleplex-android-review.googlesource.com/36594196', 'googleplex-android-review.googlesource.com/36597133', 'googleplex-android-review.googlesource.com/36601000'] into 25Q4-release.

Change-Id: I68c20eb547d080cb7bc7c725b4dbbd901bee979d