Merge change 2446

* changes:
  Fix sim-eng build.