Merge "TrivialFix: Remove unnecessary import"