Merge "Fix lint issues."