Merge change 5569 into donut

* changes:
  Trim some superfluous imports.