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