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