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

Change-Id: I253cc6470e376f75c714cc8dcb307d15bf2505ad