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

Change-Id: Ia444be2ae312880855574be0b58ceba00476c0b0