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

Change-Id: I7b1bd3439c87905ab2f843450343935c97c3b3ca