Merge cherrypicks of ['googleplex-android-review.googlesource.com/30871990'] into 25Q1-release. Change-Id: I37241de57a86429ad3ed7d3988d6760bca590de9