diff --git a/.bazelrc b/.bazelrc
index 514b7e4285d..a5ca9ab41f0 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -8,7 +8,7 @@ build --symlink_prefix=dist/
 
 # These compile flags are active no matter which build mode we are in
 # (dbg vs opt). For flags specific to build mode, see cc_toolchain_config.bzl.
-build --cxxopt="-std=c++11"
+build --cxxopt="-std=c++17"
 build --cxxopt="-fno-rtti"
 build --cxxopt="-fno-exceptions"
 build --cxxopt="-fomit-frame-pointer"
diff --git a/tfjs-backend-wasm/src/cc/kernels/DenseBincount.cc b/tfjs-backend-wasm/src/cc/kernels/DenseBincount.cc
index 51a96a972bb..e095f39ed5f 100644
--- a/tfjs-backend-wasm/src/cc/kernels/DenseBincount.cc
+++ b/tfjs-backend-wasm/src/cc/kernels/DenseBincount.cc
@@ -23,8 +23,7 @@
 #include "tfjs-backend-wasm/src/cc/backend.h"
 #include "tfjs-backend-wasm/src/cc/util.h"
 
-namespace tfjs {
-namespace wasm {
+namespace tfjs::wasm {
 
 namespace {
 
@@ -137,5 +136,4 @@ void DenseBincount(const int32_t x_id, const int32_t* x_shape_ptr,
 }
 
 }  // extern "C"
-}  // namespace wasm
-}  // namespace tfjs
+}  // namespace tfjs::wasm