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

Change-Id: Ie0b09962812600f47e56c21eba50268b10829333