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

Change-Id: Icf1fa7e2431ea3971a66158dd582c55e4138e7b2