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

Change-Id: Ibc22d2bde93ba0a6c2cb92da3b175e90e9bd3ab4