Merge "Fix to not return a bogus decryption error when a device is not encrypted."