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