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

Change-Id: I0307db1bbaeeb1fbd02a2b0029752d316639f1bd