Merge "Remove unused / invalid import" am: 9073dc4839
am: a447164ae5

Change-Id: Iba5d22f9180d9ae8fa80034193934f6aa2b1b1c6