Merge cherrypicks of ['googleplex-android-review.googlesource.com/31140191'] into 25Q1-release. Change-Id: Ic2416627b7d09bbb6066b16ab1e53965531c7c4f