Merge change 822 into donut

* changes:
  Move some simulator fixes from master to donut. In git master they were part of change 700ccfcc01d3081ff74ef5006e8f0dec5ac52a96, which was an auto import from //branches/master/...@140412 The original change was 134529 in perforce.