diff --git a/rules/swss.mk b/rules/swss.mk
index 21033361455..e4d18cf2eb3 100644
--- a/rules/swss.mk
+++ b/rules/swss.mk
@@ -8,7 +8,7 @@ $(SWSS)_DEPENDS += $(LIBSAIREDIS_DEV) $(LIBSAIMETADATA_DEV) $(LIBTEAM_DEV) \
 $(SWSS)_UNINSTALLS = $(LIBSAIVS_DEV)
 
 $(SWSS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBTEAM) \
-    $(LIBTEAMDCTL) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON)
+    $(LIBTEAMDCTL) $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON)
 SONIC_DPKG_DEBS += $(SWSS)
 
 SWSS_DBG = swss-dbg_1.0.0_$(CONFIGURED_ARCH).deb
diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
index 57e54d95619..dfde06e2f5d 160000
--- a/src/sonic-snmpagent
+++ b/src/sonic-snmpagent
@@ -1 +1 @@
-Subproject commit 57e54d9561934b853a44185bbb401207f4503292
+Subproject commit dfde06e2f5d70e23882af6c0f1af4ae43ec2fa43