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