Merge change 4263 into donut

* changes:
  Add missing system properties to sim.