am d267c1a0: Merge "remove unneeded import statements."

* commit 'd267c1a06fc91dc300d5c5f8b7ef9bd44825c34e':
  remove unneeded import statements.