diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index 7ab15fb5cf0..0dca0da02fc 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -1027,6 +1027,15 @@ if (CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO)
   if (CAFFE2_LINK_LOCAL_PROTOBUF)
     set(ONNX_PROTO_POST_BUILD_SCRIPT ${PROJECT_SOURCE_DIR}/cmake/ProtoBufPatch.cmake)
   endif()
+  # Set the ONNX_ML flag for ONNX submodule
+  if (DEFINED ENV{ONNX_ML})
+    set(ONNX_ML $ENV{ONNX_ML})
+    if (ONNX_ML)
+      add_definitions(-DONNX_ML=1)
+    endif()
+  else()
+    set(ONNX_ML OFF)
+  endif()
   # Add op schemas in "ai.onnx.pytorch" domain
   add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../caffe2/onnx/torch_ops")
   add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/onnx)
diff --git a/third_party/onnx b/third_party/onnx
index 15c33c94585..4c091e048ca 160000
--- a/third_party/onnx
+++ b/third_party/onnx
@@ -1 +1 @@
-Subproject commit 15c33c945851907411619f599900c3852108e7e3
+Subproject commit 4c091e048ca42682d63ccd3c1811560bc12b732d
diff --git a/tools/build_pytorch_libs.py b/tools/build_pytorch_libs.py
index fc60213fd8b..f331c093e72 100644
--- a/tools/build_pytorch_libs.py
+++ b/tools/build_pytorch_libs.py
@@ -162,6 +162,7 @@ def run_cmake(version,
         INSTALL_TEST=build_test,
         BUILD_CAFFE2_OPS=not check_negative_env_flag('BUILD_CAFFE2_OPS'),
         ONNX_NAMESPACE=os.getenv("ONNX_NAMESPACE", "onnx_torch"),
+        ONNX_ML=os.getenv("ONNX_ML", False),
         USE_CUDA=USE_CUDA,
         USE_DISTRIBUTED=USE_DISTRIBUTED,
         USE_FBGEMM=not (check_env_flag('NO_FBGEMM') or check_negative_env_flag('USE_FBGEMM')),