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

Change-Id: Ie301dc0e65ce80dff237a9b9dc8805de115c43e2