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

Change-Id: I4309ba53f451559864b02166fcbe64ef93b40f21