Remove unused imports

Change-Id: Ia836454597df488bab8d5e410d7b0ac0ed35550f
2 files changed