Merge "Fix API feedback on AuthenticatedKeyMetadata"