Remove unused imports, re-order

Change-Id: I2fe70fcf8cf1bafcbd6f1d40f9aa65ab6590c29c
Merge "Remove unused imports, re-order"