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

Change-Id: I40def4d9c4f51926f78b445c517dedd5cca7580e