Merge "Remove TARGET_SIMULATOR checks"