Merge change 8383

* changes:
  Fix the sim build.