Remove unused import statements am: 9343bf46e1
am: 4c1452a1d9

Change-Id: Ib2696196550c46e2c2e13af760a6d384a4d1dd7b