diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index e71e51c970..fe38395a8f 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -212,6 +212,22 @@ RUN curl -L -o hugo.deb https://github.com/gohugoio/hugo/releases/download/v0.30
     && dpkg --install hugo.deb \
     && rm hugo.deb
 
+######
+# Install Google Protobuf 3.7.1 (2.6.0 ships with Xenial)
+# Keep 2.5.0 as well, until 3.7.1 upgrade is complete.
+######
+# hadolint ignore=DL3003
+RUN mkdir -p /opt/protobuf-3.7-src \
+    && curl -L -s -S \
+      https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protobuf-java-3.7.1.tar.gz \
+      -o /opt/protobuf-3.7.1.tar.gz \
+    && tar xzf /opt/protobuf-3.7.1.tar.gz --strip-components 1 -C /opt/protobuf-3.7-src \
+    && cd /opt/protobuf-3.7-src \
+    && ./configure --prefix=/opt/protobuf-3.7 \
+    && make install \
+    && cd /root \
+    && rm -rf /opt/protobuf-3.7-src
+
 # Add a welcome message and environment checks.
 COPY hadoop_env_checks.sh /root/hadoop_env_checks.sh
 RUN chmod 755 /root/hadoop_env_checks.sh