Merge cherrypicks of ['android-review.googlesource.com/3408234'] into 25Q1-release.Change-Id: Ibf4eb7abc37960ac48f1c4769c1815a6fe470d56