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

Change-Id: Id14c3efebeb4f347c7230317cee9249455311709