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