Merge cherrypicks of ['googleplex-android-review.googlesource.com/39186893', 'googleplex-android-review.googlesource.com/39214605'] into 26Q2-release. Change-Id: I747811fdca637bd4ffed2e5c8d49dc98974a012d