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

Change-Id: I66d7fc5fb41e679cc7a59490f1e81d60311fd699