Merge change 1528 into donut

* changes:
  should help fix the Simulator build.