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

Change-Id: I691988dfd6440365e80cff30bc77e80985708786