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

Change-Id: I00c360c15772b28bf0a3bcc4918554abd1e32316