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