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