am bd1e8aa5: Merge change 5569 into donut

Merge commit 'bd1e8aa502a6d9231e2a1399cee18debcf70b3d6'

* commit 'bd1e8aa502a6d9231e2a1399cee18debcf70b3d6':
  Trim some superfluous imports.