diff --git a/src/sonic-gnmi b/src/sonic-gnmi
index 558cda6a5ce9..1d8e216e2fe6 160000
--- a/src/sonic-gnmi
+++ b/src/sonic-gnmi
@@ -1 +1 @@
-Subproject commit 558cda6a5ce900527ea2c966d800b3e84c1b2db4
+Subproject commit 1d8e216e2fe6f101c25279ae10c74d005c3a21a3
diff --git a/src/sonic-mgmt-common b/src/sonic-mgmt-common
index dca2e839246d..7aa3ec8e5afe 160000
--- a/src/sonic-mgmt-common
+++ b/src/sonic-mgmt-common
@@ -1 +1 @@
-Subproject commit dca2e839246d7e3e5d052a87bb156fd6764fa389
+Subproject commit 7aa3ec8e5afe8eb173b816e003cc688c4c788817