Merge "Fix color lint errors"