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