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