Merge "CDD: Require a default passcode to wrap the encryption key" into oc-dev