Merge cherrypicks of ['googleplex-android-review.googlesource.com/26139950'] into 24Q2-release. Change-Id: Ic7f5ddc9eea2a2f15327049e5566e3e49b08e59b