Merge cherrypicks of ['googleplex-android-review.googlesource.com/35129157'] into 25Q2-release. Change-Id: If9c6dfa9e5b545e8ed2b58ec6880318041edafb6