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