Merge cherrypicks of ['googleplex-android-review.googlesource.com/26048908', 'googleplex-android-review.googlesource.com/26049212'] into 24Q1-release. Change-Id: I9756bb1c05d1cf8067a067da5b351957947c48fb