Merge cherrypicks of ['googleplex-android-review.googlesource.com/28941561'] into 24Q3-release.

Change-Id: I09ce53177a193d7d4e49476ccbdfeb9c28a76a24