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

Change-Id: I7fbc319faf6179d298f5958aa451044a2906c982