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

Change-Id: Iead7030cb436b10e61d1395460fa785c15cce90a