Merge change 6361

* changes:
  Fix sim build.