Merge "Fix Honeycomb linting"