Merge cherrypicks of ['googleplex-android-review.googlesource.com/26570364', 'googleplex-android-review.googlesource.com/26587909'] into 24Q2-release.

Change-Id: I9e393c9b9df64bb7cdbd0c733170acada1f17428