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

Change-Id: I07e9a419b28e68c67b9e0ba77ac1a8d144b2ee80