am f0070999: Merge "Remove unsed check for simulator"

* commit 'f00709991dd13311054b78782de483b53941bcf8':
  Remove unsed check for simulator