Merge "Fix gerrit labels"