Merge "Remove check for TARGET_SIMULATOR"