Merge "Add MAC length checking for AES OCB."