Merge "Don't pass Tag::INCLUDE_UNIQUE_ID to attestKey"