Merge cherrypicks of ['googleplex-android-review.googlesource.com/34700260'] into 24Q3-platform-release. Change-Id: I8ee10f06390a82b292ac39b58590ea58b1c6508a