Merge change 6143 into donut

* changes:
  Fix the simulator.