am 5a785719: am 4fed05b4: am f0070999: Merge "Remove unsed check for simulator"

* commit '5a785719492519afe54eb2dbde3094253826d695':
  Remove unsed check for simulator