diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
index 353cbe4566..1c6b484814 100755
--- a/dockers/docker-platform-monitor/Dockerfile.j2
+++ b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -35,8 +35,8 @@ RUN apt-get update &&   \
 # doesn't ensure all dependencies are installed in the container. So here we
 # install any dependencies required by the Arista sonic_platform package.
 # TODO: eliminate the need to install these explicitly.
-RUN pip3 install grpcio==1.57.0 \
-        grpcio-tools==1.57.0
+RUN pip3 install grpcio==1.39.0 \
+        grpcio-tools==1.39.0
 
 # Barefoot platform vendors' sonic_platform packages import these Python libraries
 RUN pip3 install thrift==0.13.0 netifaces
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3
index 05dd39450b..858ef36164 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-py3
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-py3
@@ -1,8 +1,8 @@
 attrs==20.3.0
 certifi==2023.5.7
 charset-normalizer==3.1.0
-grpcio==1.57.0
-grpcio-tools==1.57.0
+grpcio==1.39.0
+grpcio-tools==1.39.0
 guacamole==0.9.2
 idna==3.4
 importlib-metadata==1.6.0
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 3b534eb278..92a1d95981 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,4 +1,4 @@
-LIBSAIBCM_XGS_VERSION = 8.4.21.0
+LIBSAIBCM_XGS_VERSION = 8.4.31.0
 LIBSAIBCM_DNX_VERSION = 7.1.111.1
 LIBSAIBCM_XGS_BRANCH_NAME = SAI_8.4.0_GA
 LIBSAIBCM_DNX_BRANCH_NAME = REL_7.0_SAI_1.11
diff --git a/src/sonic-restapi b/src/sonic-restapi
index ccad4a24b3..7971aa3c1f 160000
--- a/src/sonic-restapi
+++ b/src/sonic-restapi
@@ -1 +1 @@
-Subproject commit ccad4a24b3ea2dd1afd3391f7e99864bd1414976
+Subproject commit 7971aa3c1fa5e02c099df10fc3e4fdc7d89f99ec