Merge "Remove unused import statement"