Merge "Remove checks for TARGET_SIMULATOR"