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

Change-Id: Id50ede33f8695d65dfeada0972f54335f7c7a8d2