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

Change-Id: I3ffd3326ab7b7f6a803b265f2950b06c9316a54e