Merge change 26719 into eclair

* changes:
  fix simulator build