am b72302d1: Merge change 3597 into donut

Merge commit 'b72302d19bb451c1a289ef971a232c4b8b065503'

* commit 'b72302d19bb451c1a289ef971a232c4b8b065503':
  Add missing file and remove unused imports