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

Change-Id: I6a7b7a923f1ca6f7878ffcd954e89444162e5da9