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