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

Change-Id: Ic21fca5cefd6290369ccd20e9a3a0f7de1da8af2