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

Change-Id: Ie5a3206f6859834193c6e59c3531af1a18206717