Merge "DO NOT MERGE Fix color_lint errors"