Merge "Use correct endianness for encryption keys"