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

Change-Id: Ifc977ae7373b85c2664bbc6879d6b7473b7b953d