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

Change-Id: I9906d2bd5eb7b4410e363a26f1e9855ae785eea9