diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000000..ea91c9ecfe
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1 @@
+BasedOnStyle: google
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2eba8edd45..49e8d19e8f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,6 +91,19 @@ jobs:
         run: |
           ! git grep 'python_version = "PY2"' '*BUILD'
 
+  lint-proto:
+    runs-on: ubuntu-16.04
+    steps:
+      - uses: actions/checkout@v1
+      - name: clang-format lint
+        uses: DoozyX/clang-format-lint-action@v0.5
+        with:
+          source: ./tensorboard
+          # Exclude tensorboard/compat because the source of truth is TensorFlow.
+          exclude: ./tensorboard/compat/proto
+          extensions: 'proto'
+          clangFormatVersion: 9
+
   check-misc:
     runs-on: ubuntu-16.04
     steps:
diff --git a/tensorboard/plugins/custom_scalar/layout.proto b/tensorboard/plugins/custom_scalar/layout.proto
index 0a3342644f..f26204ea72 100644
--- a/tensorboard/plugins/custom_scalar/layout.proto
+++ b/tensorboard/plugins/custom_scalar/layout.proto
@@ -17,7 +17,6 @@ syntax = "proto3";
 
 package tensorboard;
 
-
 /**
  * Encapsulates information on a single chart. Many charts appear in a category.
  */