Merge cherrypicks of ['googleplex-android-review.googlesource.com/28044920'] into security-aosp-udc-release.

Change-Id: I28d5fa2337eeda9b6f11ab09d948175685d74998