Merge "Clean up lint errors" into sc-dev