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

Change-Id: I0ed38e4d3e7f8114fbb866ac032fa4d96900de54