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

Change-Id: Idc16283f5ba75974ed1a9c673c7d211162b0486b