Remove duplicate and bad import

Change-Id: I0fdc3a48a26b527173b634eddb77eeedce4985ce
Merge "Remove duplicate and bad import"