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

Change-Id: Ibe023f76023758f9a97742695ac114ae18f3963a