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