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