Remove unused use clauses

Change-Id: Id84d1a4085214f8aa1ab2ce5809d6a53bedfc5d6
Merge "Remove unused use clauses"