Merge cherrypicks of ['googleplex-android-review.googlesource.com/35064856'] into 25Q2-release. Change-Id: I8979b664f92747496e0ff268acc9f958a3b4dd0b