Merge "Fix lint error and typo."