Merge cherrypicks of ['googleplex-android-review.googlesource.com/34873192'] into 25Q3-release. Change-Id: Ic8bf5fe546821b339f6a823b290cd8f2dd5d9f3c