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

Change-Id: I9b789dd350a7784e67645b4a7e4a8f7ee4ef5ffc