am 51deeeae: Merge "Remove references to the simulator."

* commit '51deeeae0f8616d45414aa916bf961e053634eb0':
  Remove references to the simulator.