Merge "Remove unused import to fix build breakage"