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