Merge cherrypicks of ['googleplex-android-review.googlesource.com/31241421'] into 25Q2-release.

Change-Id: I274edb827113f25f1c0d0488fdde202abfa5804b