Merge cherrypicks of ['googleplex-android-review.googlesource.com/36107644'] into 25Q4-release.

Change-Id: Id329af8fdd26cd78490397c96b293307bc2b31e2