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

Change-Id: I496d5bfba536ccf1491bbba41eae8cf437f10d7a