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

Change-Id: Ib441f6efcb2632283b40def47480421773c7c11b