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