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