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

* commit '4fed05b4e679276050b5eaad51ce96848ddc561e':
  Remove unsed check for simulator