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