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

Change-Id: Iea2a79b79c7024a92a96aef5ca8e3141ed2ea032