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

Change-Id: I17f44b7f5e1de035c9eeb2c7676545d06604818d