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

Change-Id: I6444e11f919f6f2fee2c99d60721bbd39229061a