Merge "Stop checking HOST_OS"