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