1. Get rid of unused import. 2. Fix import order. Change-Id: I278949d95242682fd277adc2c71bc892e58a8533