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