Merge "Remove unused check for simulator"