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