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