Merge "Fixed lint issues"