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

Change-Id: I4b80e5c507431fc55d0d29c1b7428444340bdedb