Merge cherrypicks of ['googleplex-android-review.googlesource.com/30037310'] into 24Q4-release.

Change-Id: Ia3a1c1756ccbf5eae6a234ecee3840536e371ebf