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

Change-Id: I3385362d1122bf21353ad1e46500a68cd34ae539