diff --git a/platform/mellanox/mlnx-platform-api.mk b/platform/mellanox/mlnx-platform-api.mk
index 496f393caa..ecd8b8532e 100644
--- a/platform/mellanox/mlnx-platform-api.mk
+++ b/platform/mellanox/mlnx-platform-api.mk
@@ -14,17 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SONIC_PLATFORM_API_PY2 package
-
-ifeq ($(ENABLE_PY2_MODULES), y)
-    SONIC_PLATFORM_API_PY2 = mlnx_platform_api-1.0-py2-none-any.whl
-    $(SONIC_PLATFORM_API_PY2)_SRC_PATH = $(PLATFORM_PATH)/mlnx-platform-api
-    $(SONIC_PLATFORM_API_PY2)_PYTHON_VERSION = 2
-    $(SONIC_PLATFORM_API_PY2)_DEPENDS = $(SONIC_PY_COMMON_PY2) $(SONIC_PLATFORM_COMMON_PY2) $(SONIC_CONFIG_ENGINE_PY2)
-    SONIC_PYTHON_WHEELS += $(SONIC_PLATFORM_API_PY2)
-endif
-
-export mlnx_platform_api_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_API_PY2))"
 
 # SONIC_PLATFORM_API_PY3 package
 
diff --git a/rules/sonic-platform-common.dep b/rules/sonic-platform-common.dep
index 632c92c1ac..e65222869c 100644
--- a/rules/sonic-platform-common.dep
+++ b/rules/sonic-platform-common.dep
@@ -4,14 +4,6 @@ DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/sonic-platform-common.mk rules/s
 DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
 SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files|grep -Ev "^sonic_sfp|^sonic_eeprom"))
 
-ifeq ($(ENABLE_PY2_MODULES), y)
-    $(SONIC_PLATFORM_COMMON_PY2)_CACHE_MODE  := GIT_CONTENT_SHA 
-    $(SONIC_PLATFORM_COMMON_PY2)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
-    $(SONIC_PLATFORM_COMMON_PY2)_DEP_FILES   := $(DEP_FILES)
-    $(SONIC_PLATFORM_COMMON_PY2)_SMDEP_FILES := $(SMDEP_FILES)
-    $(SONIC_PLATFORM_COMMON_PY2)_SMDEP_PATHS := $(SPATH)
-endif
-
 
 $(SONIC_PLATFORM_COMMON_PY3)_CACHE_MODE  := GIT_CONTENT_SHA 
 $(SONIC_PLATFORM_COMMON_PY3)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
diff --git a/rules/sonic-platform-common.mk b/rules/sonic-platform-common.mk
index 09ce14faab..bd5f14eaf9 100644
--- a/rules/sonic-platform-common.mk
+++ b/rules/sonic-platform-common.mk
@@ -1,22 +1,7 @@
-ifeq ($(ENABLE_PY2_MODULES), y)
-    # sonic-platform-common package
-
-    SONIC_PLATFORM_COMMON_PY2 = sonic_platform_common-1.0-py2-none-any.whl
-    $(SONIC_PLATFORM_COMMON_PY2)_SRC_PATH = $(SRC_PATH)/sonic-platform-common
-    $(SONIC_PLATFORM_COMMON_PY2)_PYTHON_VERSION = 2
-    $(SONIC_PLATFORM_COMMON_PY2)_DEPENDS += $(SONIC_PY_COMMON_PY2) $(SONIC_CONFIG_ENGINE_PY2)
-    $(SONIC_PLATFORM_COMMON_PY2)_DEBS_DEPENDS += $(PYTHON_SWSSCOMMON)
-    SONIC_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2)
-endif
-
 # Als build sonic-platform-common into python3 wheel, so we can use PSU code in SNMP docker
 SONIC_PLATFORM_COMMON_PY3 = sonic_platform_common-1.0-py3-none-any.whl
 $(SONIC_PLATFORM_COMMON_PY3)_SRC_PATH = $(SRC_PATH)/sonic-platform-common
 $(SONIC_PLATFORM_COMMON_PY3)_PYTHON_VERSION = 3
 $(SONIC_PLATFORM_COMMON_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) $(SONIC_CONFIG_ENGINE_PY3)
 $(SONIC_PLATFORM_COMMON_PY3)_DEBS_DEPENDS += $(PYTHON3_SWSSCOMMON)
-ifeq ($(ENABLE_PY2_MODULES), y)
-    # Synthetic dependency just to avoid race condition
-    $(SONIC_PLATFORM_COMMON_PY3)_DEPENDS += $(SONIC_PLATFORM_COMMON_PY2)
-endif
 SONIC_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY3)
diff --git a/slave.mk b/slave.mk
index c092ea0d27..0924eab54d 100644
--- a/slave.mk
+++ b/slave.mk
@@ -1065,7 +1065,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PY_COMMON_PY3)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CONFIG_ENGINE_PY2)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CONFIG_ENGINE_PY3)) \
-        $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_COMMON_PY2)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_COMMON_PY3)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(REDIS_DUMP_LOAD_PY2)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_API_PY2)) \
@@ -1135,7 +1134,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
 	export config_engine_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CONFIG_ENGINE_PY3))"
 	export swsssdk_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SWSSSDK_PY2))"
 	export swsssdk_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SWSSSDK_PY3))"
-	export platform_common_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_COMMON_PY2))"
 	export platform_common_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_COMMON_PY3))"
 	export redis_dump_load_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(REDIS_DUMP_LOAD_PY2))"
 	export redis_dump_load_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(REDIS_DUMP_LOAD_PY3))"
diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index b70e75979f..f575a401b8 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit b70e75979f704e980a3fb20732642ec99f32b0ee
+Subproject commit f575a401b83bbd5d6b6d68824ff22eae8647be16
diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 9ac12bfb40..0d90023b4a 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 9ac12bfb406416b0fb3b03a084d8179bdc53f3a6
+Subproject commit 0d90023b4ae973bd2fa01381d4d1ba4992b45025