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

Change-Id: Id71075979bcbda1bade054c122bd85a417bf3296