diff --git a/tensorflow/core/kernels/data/experimental/map_and_batch_dataset_op.cc b/tensorflow/core/kernels/data/experimental/map_and_batch_dataset_op.cc
index a5d88e89d7f..09783161091 100644
--- a/tensorflow/core/kernels/data/experimental/map_and_batch_dataset_op.cc
+++ b/tensorflow/core/kernels/data/experimental/map_and_batch_dataset_op.cc
@@ -125,8 +125,9 @@ class MapAndBatchDatasetOp::Dataset : public DatasetBase {
   }
 
   int64 Cardinality() const override {
-    if (!preserve_cardinality_)
+    if (!preserve_cardinality_) {
       return kUnknownCardinality;
+    }
     int64 n = input_->Cardinality();
     if (n == kInfiniteCardinality || n == kUnknownCardinality) {
       return n;
diff --git a/tensorflow/core/kernels/data/experimental/scan_dataset_op.cc b/tensorflow/core/kernels/data/experimental/scan_dataset_op.cc
index e78e9cecec5..723f32311d0 100644
--- a/tensorflow/core/kernels/data/experimental/scan_dataset_op.cc
+++ b/tensorflow/core/kernels/data/experimental/scan_dataset_op.cc
@@ -107,10 +107,11 @@ class ScanDatasetOp : public UnaryDatasetOpKernel {
     string DebugString() const override { return "ScanDatasetOp::Dataset"; }
 
     int64 Cardinality() const override {
-      if (preserve_cardinality_)
+      if (preserve_cardinality_) {
         return input_->Cardinality();
-      else
+      } else {
         return kUnknownCardinality;
+      }
     }
 
     Status CheckExternalState() const override {
diff --git a/tensorflow/core/kernels/data/map_dataset_op.cc b/tensorflow/core/kernels/data/map_dataset_op.cc
index c29ba83f10d..d34e4f2b041 100644
--- a/tensorflow/core/kernels/data/map_dataset_op.cc
+++ b/tensorflow/core/kernels/data/map_dataset_op.cc
@@ -73,10 +73,11 @@ class MapDatasetOp::Dataset : public DatasetBase {
   }
 
   int64 Cardinality() const override {
-    if (preserve_cardinality_)
+    if (preserve_cardinality_) {
       return input_->Cardinality();
-    else
+    } else {
       return kUnknownCardinality;
+    }
   }
 
   Status CheckExternalState() const override {
diff --git a/tensorflow/core/kernels/data/parallel_map_dataset_op.cc b/tensorflow/core/kernels/data/parallel_map_dataset_op.cc
index 87af525c4d3..bae90549841 100644
--- a/tensorflow/core/kernels/data/parallel_map_dataset_op.cc
+++ b/tensorflow/core/kernels/data/parallel_map_dataset_op.cc
@@ -110,10 +110,11 @@ class ParallelMapDatasetOp::Dataset : public DatasetBase {
   }
 
   int64 Cardinality() const override {
-    if (preserve_cardinality_)
+    if (preserve_cardinality_) {
       return input_->Cardinality();
-    else
+    } else {
       return kUnknownCardinality;
+    }
   }
 
   Status CheckExternalState() const override {