Merge cherrypicks of ['googleplex-android-review.googlesource.com/38675413'] into 25Q2-release. Change-Id: I8cee1d1e28942b72948c7ae74d7b4d9d4a3662aa