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