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