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

Change-Id: I31279ee7ea8e28bf7113c6e49681dffe41f6b09f