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

Change-Id: I83c1e324eac480eec51959b415f7835d0253a19d