Merge cherrypicks of ['googleplex-android-review.googlesource.com/27403219'] into security-aosp-udc-release. Change-Id: I37a4fbc21686ebb72ed390bce60452d16a07bf75