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