am f463f043: am a9c8a585: Merge "Remove stray unused import."

* commit 'f463f0438f98bae6c8d5d909f09a7807162e9ae9':
  Remove stray unused import.