am a9c8a585: Merge "Remove stray unused import."

* commit 'a9c8a585372f2c61270b515d4857a595012e0301':
  Remove stray unused import.