Merge "Fix lint error"