Merge "Removed e4crypt_create_device_key" into oc-dev