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