Merge "Remove duplicate import"