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

Change-Id: Icdac480b7ce256c4d795c35186f9b19632fb9c1a