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

Change-Id: Icd39d49c9fae7c11837434fdcbe5603310034ad3