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