Merge cherrypicks of ['googleplex-android-review.googlesource.com/29693205', 'googleplex-android-review.googlesource.com/30387611'] into security-aosp-udc-release.

Change-Id: I3ab827be10a18d55753724720471561679d93996