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

Change-Id: I13f68d6be5d09b0afec70e7ce580763cadc0a5a8