Merge "Fix lint issue."