Merge cherrypicks of ['googleplex-android-review.googlesource.com/35961270'] into 25Q4-release. Change-Id: I99c563bb3cdca965fd4d66dc256a59026f39be40