Merge cherrypicks of ['googleplex-android-review.googlesource.com/31522397'] into 25Q1-release. Change-Id: I7b16ac51c2071d6597b989c7fbbc0db352bcd078