Merge "Add AES key generation support."