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

Change-Id: I7f3bda801dfde03b5cead6d4810f49fe0579762f