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

* commit '0661627cf641ea71d8f5a78deb758e49b12c2d3a':
  Remove references to the simulator.