diff --git a/examples/2016-10-31/policy_templates/all_policy_templates.yaml b/examples/2016-10-31/policy_templates/all_policy_templates.yaml
index 48a5909e6c..9d652528ef 100644
--- a/examples/2016-10-31/policy_templates/all_policy_templates.yaml
+++ b/examples/2016-10-31/policy_templates/all_policy_templates.yaml
@@ -14,8 +14,6 @@ Resources:
         - LambdaInvokePolicy:
             FunctionName: name
 
-        - CloudWatchDescribeAlarmHistoryPolicy: {}
-
         - CloudWatchPutMetricPolicy: {}
 
         - EC2DescribePolicy: {}
diff --git a/samtranslator/policy_templates_data/policy_templates.json b/samtranslator/policy_templates_data/policy_templates.json
index 753632b71d..4a825852cc 100644
--- a/samtranslator/policy_templates_data/policy_templates.json
+++ b/samtranslator/policy_templates_data/policy_templates.json
@@ -62,21 +62,6 @@
         ]
       }
     },
-    "CloudWatchDescribeAlarmHistoryPolicy": {
-      "Description": "Gives permissions to describe CloudWatch alarm history",
-      "Parameters": {},
-      "Definition": {
-        "Statement": [
-          {
-            "Effect": "Allow",
-            "Action": [
-              "cloudwatch:DescribeAlarmHistory"
-            ],
-            "Resource": "*"
-          }
-        ]
-      }
-    },
     "CloudWatchPutMetricPolicy": {
       "Description": "Gives permissions to put metrics to CloudWatch",
       "Parameters": {
diff --git a/tests/translator/input/all_policy_templates.yaml b/tests/translator/input/all_policy_templates.yaml
index da6e00810c..47509c70ea 100644
--- a/tests/translator/input/all_policy_templates.yaml
+++ b/tests/translator/input/all_policy_templates.yaml
@@ -18,8 +18,6 @@ Resources:
         - LambdaInvokePolicy:
             FunctionName: name
 
-        - CloudWatchDescribeAlarmHistoryPolicy: {}
-
         - CloudWatchPutMetricPolicy: {}
 
         - EC2DescribePolicy: {}
diff --git a/tests/translator/output/all_policy_templates.json b/tests/translator/output/all_policy_templates.json
index df2b4f9847..ba1fd00f49 100644
--- a/tests/translator/output/all_policy_templates.json
+++ b/tests/translator/output/all_policy_templates.json
@@ -79,20 +79,6 @@
           },
           {
             "PolicyName": "KitchenSinkFunctionRolePolicy2",
-            "PolicyDocument": {
-              "Statement": [
-                {
-                  "Action": [
-                    "cloudwatch:DescribeAlarmHistory"
-                  ],
-                  "Resource": "*",
-                  "Effect": "Allow"
-                }
-              ]
-            }
-          },
-          {
-            "PolicyName": "KitchenSinkFunctionRolePolicy3",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -106,7 +92,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy4",
+            "PolicyName": "KitchenSinkFunctionRolePolicy3",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -121,7 +107,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy5",
+            "PolicyName": "KitchenSinkFunctionRolePolicy4",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -161,7 +147,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy6",
+            "PolicyName": "KitchenSinkFunctionRolePolicy5",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -196,7 +182,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy7",
+            "PolicyName": "KitchenSinkFunctionRolePolicy6",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -217,7 +203,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy8",
+            "PolicyName": "KitchenSinkFunctionRolePolicy7",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -239,7 +225,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy9",
+            "PolicyName": "KitchenSinkFunctionRolePolicy8",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -274,7 +260,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy10",
+            "PolicyName": "KitchenSinkFunctionRolePolicy9",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -313,7 +299,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy11",
+            "PolicyName": "KitchenSinkFunctionRolePolicy10",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -329,7 +315,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy12",
+            "PolicyName": "KitchenSinkFunctionRolePolicy11",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -345,7 +331,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy13",
+            "PolicyName": "KitchenSinkFunctionRolePolicy12",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -369,7 +355,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy14",
+            "PolicyName": "KitchenSinkFunctionRolePolicy13",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -393,7 +379,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy15",
+            "PolicyName": "KitchenSinkFunctionRolePolicy14",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -415,7 +401,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy16",
+            "PolicyName": "KitchenSinkFunctionRolePolicy15",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -436,7 +422,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy17",
+            "PolicyName": "KitchenSinkFunctionRolePolicy16",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -457,7 +443,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy18",
+            "PolicyName": "KitchenSinkFunctionRolePolicy17",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -474,7 +460,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy19",
+            "PolicyName": "KitchenSinkFunctionRolePolicy18",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -499,7 +485,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy20",
+            "PolicyName": "KitchenSinkFunctionRolePolicy19",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -532,7 +518,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy21",
+            "PolicyName": "KitchenSinkFunctionRolePolicy20",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -556,7 +542,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy22",
+            "PolicyName": "KitchenSinkFunctionRolePolicy21",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -581,7 +567,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy23",
+            "PolicyName": "KitchenSinkFunctionRolePolicy22",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -614,7 +600,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy24",
+            "PolicyName": "KitchenSinkFunctionRolePolicy23",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -633,7 +619,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy25",
+            "PolicyName": "KitchenSinkFunctionRolePolicy24",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -671,7 +657,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy26",
+            "PolicyName": "KitchenSinkFunctionRolePolicy25",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -724,7 +710,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy27",
+            "PolicyName": "KitchenSinkFunctionRolePolicy26",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -739,7 +725,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy28",
+            "PolicyName": "KitchenSinkFunctionRolePolicy27",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -763,7 +749,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy29",
+            "PolicyName": "KitchenSinkFunctionRolePolicy28",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -784,7 +770,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy30",
+            "PolicyName": "KitchenSinkFunctionRolePolicy29",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -805,7 +791,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy31",
+            "PolicyName": "KitchenSinkFunctionRolePolicy30",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -822,7 +808,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy32",
+            "PolicyName": "KitchenSinkFunctionRolePolicy31",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -837,7 +823,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy33",
+            "PolicyName": "KitchenSinkFunctionRolePolicy32",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -852,7 +838,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy34",
+            "PolicyName": "KitchenSinkFunctionRolePolicy33",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -890,7 +876,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy35",
+            "PolicyName": "KitchenSinkFunctionRolePolicy34",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -931,7 +917,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy36",
+            "PolicyName": "KitchenSinkFunctionRolePolicy35",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -952,7 +938,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy37",
+            "PolicyName": "KitchenSinkFunctionRolePolicy36",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -990,7 +976,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy38",
+            "PolicyName": "KitchenSinkFunctionRolePolicy37",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1004,7 +990,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy39",
+            "PolicyName": "KitchenSinkFunctionRolePolicy38",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1027,7 +1013,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy40",
+            "PolicyName": "KitchenSinkFunctionRolePolicy39",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1044,7 +1030,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy41",
+            "PolicyName": "KitchenSinkFunctionRolePolicy40",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1069,7 +1055,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy42",
+            "PolicyName": "KitchenSinkFunctionRolePolicy41",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1084,7 +1070,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy43",
+            "PolicyName": "KitchenSinkFunctionRolePolicy42",
             "PolicyDocument": {
               "Statement": [{
                 "Effect": "Allow",
@@ -1101,7 +1087,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy44",
+            "PolicyName": "KitchenSinkFunctionRolePolicy43",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1115,7 +1101,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy45",
+            "PolicyName": "KitchenSinkFunctionRolePolicy44",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1136,7 +1122,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy46",
+            "PolicyName": "KitchenSinkFunctionRolePolicy45",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1162,7 +1148,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy47",
+            "PolicyName": "KitchenSinkFunctionRolePolicy46",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1181,7 +1167,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy48",
+            "PolicyName": "KitchenSinkFunctionRolePolicy47",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1202,7 +1188,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy49",
+            "PolicyName": "KitchenSinkFunctionRolePolicy48",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1232,7 +1218,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy50",
+            "PolicyName": "KitchenSinkFunctionRolePolicy49",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1253,7 +1239,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy51",
+            "PolicyName": "KitchenSinkFunctionRolePolicy50",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1335,7 +1321,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy52",
+            "PolicyName": "KitchenSinkFunctionRolePolicy51",
             "PolicyDocument": {
               "Statement": [
                 {
diff --git a/tests/translator/output/aws-cn/all_policy_templates.json b/tests/translator/output/aws-cn/all_policy_templates.json
index a69ea31c86..36123aedfd 100644
--- a/tests/translator/output/aws-cn/all_policy_templates.json
+++ b/tests/translator/output/aws-cn/all_policy_templates.json
@@ -79,20 +79,6 @@
           },
           {
             "PolicyName": "KitchenSinkFunctionRolePolicy2",
-            "PolicyDocument": {
-              "Statement": [
-                {
-                  "Action": [
-                    "cloudwatch:DescribeAlarmHistory"
-                  ],
-                  "Resource": "*",
-                  "Effect": "Allow"
-                }
-              ]
-            }
-          },
-          {
-            "PolicyName": "KitchenSinkFunctionRolePolicy3",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -106,7 +92,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy4",
+            "PolicyName": "KitchenSinkFunctionRolePolicy3",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -121,7 +107,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy5",
+            "PolicyName": "KitchenSinkFunctionRolePolicy4",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -160,7 +146,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy6",
+            "PolicyName": "KitchenSinkFunctionRolePolicy5",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -195,7 +181,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy7",
+            "PolicyName": "KitchenSinkFunctionRolePolicy6",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -216,7 +202,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy8",
+            "PolicyName": "KitchenSinkFunctionRolePolicy7",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -238,7 +224,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy9",
+            "PolicyName": "KitchenSinkFunctionRolePolicy8",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -273,7 +259,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy10",
+            "PolicyName": "KitchenSinkFunctionRolePolicy9",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -312,7 +298,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy11",
+            "PolicyName": "KitchenSinkFunctionRolePolicy10",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -328,7 +314,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy12",
+            "PolicyName": "KitchenSinkFunctionRolePolicy11",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -344,7 +330,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy13",
+            "PolicyName": "KitchenSinkFunctionRolePolicy12",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -368,7 +354,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy14",
+            "PolicyName": "KitchenSinkFunctionRolePolicy13",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -392,7 +378,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy15",
+            "PolicyName": "KitchenSinkFunctionRolePolicy14",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -414,7 +400,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy16",
+            "PolicyName": "KitchenSinkFunctionRolePolicy15",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -435,7 +421,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy17",
+            "PolicyName": "KitchenSinkFunctionRolePolicy16",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -456,7 +442,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy18",
+            "PolicyName": "KitchenSinkFunctionRolePolicy17",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -473,7 +459,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy19",
+            "PolicyName": "KitchenSinkFunctionRolePolicy18",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -498,7 +484,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy20",
+            "PolicyName": "KitchenSinkFunctionRolePolicy19",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -531,7 +517,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy21",
+            "PolicyName": "KitchenSinkFunctionRolePolicy20",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -555,7 +541,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy22",
+            "PolicyName": "KitchenSinkFunctionRolePolicy21",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -580,7 +566,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy23",
+            "PolicyName": "KitchenSinkFunctionRolePolicy22",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -613,7 +599,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy24",
+            "PolicyName": "KitchenSinkFunctionRolePolicy23",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -632,7 +618,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy25",
+            "PolicyName": "KitchenSinkFunctionRolePolicy24",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -670,7 +656,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy26",
+            "PolicyName": "KitchenSinkFunctionRolePolicy25",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -723,7 +709,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy27",
+            "PolicyName": "KitchenSinkFunctionRolePolicy26",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -738,7 +724,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy28",
+            "PolicyName": "KitchenSinkFunctionRolePolicy27",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -762,7 +748,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy29",
+            "PolicyName": "KitchenSinkFunctionRolePolicy28",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -783,7 +769,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy30",
+            "PolicyName": "KitchenSinkFunctionRolePolicy29",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -804,7 +790,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy31",
+            "PolicyName": "KitchenSinkFunctionRolePolicy30",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -821,7 +807,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy32",
+            "PolicyName": "KitchenSinkFunctionRolePolicy31",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -836,7 +822,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy33",
+            "PolicyName": "KitchenSinkFunctionRolePolicy32",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -851,7 +837,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy34",
+            "PolicyName": "KitchenSinkFunctionRolePolicy33",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -889,7 +875,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy35",
+            "PolicyName": "KitchenSinkFunctionRolePolicy34",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -930,7 +916,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy36",
+            "PolicyName": "KitchenSinkFunctionRolePolicy35",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -951,7 +937,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy37",
+            "PolicyName": "KitchenSinkFunctionRolePolicy36",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -989,7 +975,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy38",
+            "PolicyName": "KitchenSinkFunctionRolePolicy37",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1003,7 +989,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy39",
+            "PolicyName": "KitchenSinkFunctionRolePolicy38",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1026,7 +1012,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy40",
+            "PolicyName": "KitchenSinkFunctionRolePolicy39",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1043,7 +1029,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy41",
+            "PolicyName": "KitchenSinkFunctionRolePolicy40",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1068,7 +1054,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy42",
+            "PolicyName": "KitchenSinkFunctionRolePolicy41",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1083,7 +1069,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy43",
+            "PolicyName": "KitchenSinkFunctionRolePolicy42",
             "PolicyDocument": {
               "Statement": [{
                 "Effect": "Allow",
@@ -1100,7 +1086,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy44",
+            "PolicyName": "KitchenSinkFunctionRolePolicy43",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1114,7 +1100,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy45",
+            "PolicyName": "KitchenSinkFunctionRolePolicy44",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1135,7 +1121,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy46",
+            "PolicyName": "KitchenSinkFunctionRolePolicy45",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1161,7 +1147,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy47",
+            "PolicyName": "KitchenSinkFunctionRolePolicy46",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1180,7 +1166,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy48",
+            "PolicyName": "KitchenSinkFunctionRolePolicy47",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1201,7 +1187,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy49",
+            "PolicyName": "KitchenSinkFunctionRolePolicy48",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1231,7 +1217,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy50",
+            "PolicyName": "KitchenSinkFunctionRolePolicy49",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1252,7 +1238,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy51",
+            "PolicyName": "KitchenSinkFunctionRolePolicy50",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1334,7 +1320,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy52",
+            "PolicyName": "KitchenSinkFunctionRolePolicy51",
             "PolicyDocument": {
               "Statement": [
                 {
diff --git a/tests/translator/output/aws-us-gov/all_policy_templates.json b/tests/translator/output/aws-us-gov/all_policy_templates.json
index e1b2a6a31e..256e76cc72 100644
--- a/tests/translator/output/aws-us-gov/all_policy_templates.json
+++ b/tests/translator/output/aws-us-gov/all_policy_templates.json
@@ -79,20 +79,6 @@
           },
           {
             "PolicyName": "KitchenSinkFunctionRolePolicy2",
-            "PolicyDocument": {
-              "Statement": [
-                {
-                  "Action": [
-                    "cloudwatch:DescribeAlarmHistory"
-                  ],
-                  "Resource": "*",
-                  "Effect": "Allow"
-                }
-              ]
-            }
-          },
-          {
-            "PolicyName": "KitchenSinkFunctionRolePolicy3",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -106,7 +92,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy4",
+            "PolicyName": "KitchenSinkFunctionRolePolicy3",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -121,7 +107,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy5",
+            "PolicyName": "KitchenSinkFunctionRolePolicy4",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -160,7 +146,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy6",
+            "PolicyName": "KitchenSinkFunctionRolePolicy5",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -195,7 +181,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy7",
+            "PolicyName": "KitchenSinkFunctionRolePolicy6",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -216,7 +202,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy8",
+            "PolicyName": "KitchenSinkFunctionRolePolicy7",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -238,7 +224,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy9",
+            "PolicyName": "KitchenSinkFunctionRolePolicy8",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -273,7 +259,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy10",
+            "PolicyName": "KitchenSinkFunctionRolePolicy9",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -312,7 +298,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy11",
+            "PolicyName": "KitchenSinkFunctionRolePolicy10",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -328,7 +314,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy12",
+            "PolicyName": "KitchenSinkFunctionRolePolicy11",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -344,7 +330,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy13",
+            "PolicyName": "KitchenSinkFunctionRolePolicy12",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -368,7 +354,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy14",
+            "PolicyName": "KitchenSinkFunctionRolePolicy13",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -392,7 +378,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy15",
+            "PolicyName": "KitchenSinkFunctionRolePolicy14",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -414,7 +400,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy16",
+            "PolicyName": "KitchenSinkFunctionRolePolicy15",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -435,7 +421,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy17",
+            "PolicyName": "KitchenSinkFunctionRolePolicy16",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -456,7 +442,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy18",
+            "PolicyName": "KitchenSinkFunctionRolePolicy17",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -473,7 +459,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy19",
+            "PolicyName": "KitchenSinkFunctionRolePolicy18",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -498,7 +484,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy20",
+            "PolicyName": "KitchenSinkFunctionRolePolicy19",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -531,7 +517,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy21",
+            "PolicyName": "KitchenSinkFunctionRolePolicy20",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -555,7 +541,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy22",
+            "PolicyName": "KitchenSinkFunctionRolePolicy21",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -580,7 +566,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy23",
+            "PolicyName": "KitchenSinkFunctionRolePolicy22",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -613,7 +599,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy24",
+            "PolicyName": "KitchenSinkFunctionRolePolicy23",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -632,7 +618,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy25",
+            "PolicyName": "KitchenSinkFunctionRolePolicy24",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -670,7 +656,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy26",
+            "PolicyName": "KitchenSinkFunctionRolePolicy25",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -723,7 +709,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy27",
+            "PolicyName": "KitchenSinkFunctionRolePolicy26",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -738,7 +724,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy28",
+            "PolicyName": "KitchenSinkFunctionRolePolicy27",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -762,7 +748,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy29",
+            "PolicyName": "KitchenSinkFunctionRolePolicy28",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -783,7 +769,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy30",
+            "PolicyName": "KitchenSinkFunctionRolePolicy29",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -804,7 +790,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy31",
+            "PolicyName": "KitchenSinkFunctionRolePolicy30",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -821,7 +807,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy32",
+            "PolicyName": "KitchenSinkFunctionRolePolicy31",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -836,7 +822,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy33",
+            "PolicyName": "KitchenSinkFunctionRolePolicy32",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -851,7 +837,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy34",
+            "PolicyName": "KitchenSinkFunctionRolePolicy33",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -889,7 +875,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy35",
+            "PolicyName": "KitchenSinkFunctionRolePolicy34",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -930,7 +916,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy36",
+            "PolicyName": "KitchenSinkFunctionRolePolicy35",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -951,7 +937,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy37",
+            "PolicyName": "KitchenSinkFunctionRolePolicy36",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -989,7 +975,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy38",
+            "PolicyName": "KitchenSinkFunctionRolePolicy37",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1003,7 +989,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy39",
+            "PolicyName": "KitchenSinkFunctionRolePolicy38",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1027,7 +1013,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy40",
+            "PolicyName": "KitchenSinkFunctionRolePolicy39",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1044,7 +1030,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy41",
+            "PolicyName": "KitchenSinkFunctionRolePolicy40",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1069,7 +1055,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy42",
+            "PolicyName": "KitchenSinkFunctionRolePolicy41",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1084,7 +1070,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy43",
+            "PolicyName": "KitchenSinkFunctionRolePolicy42",
             "PolicyDocument": {
               "Statement": [{
                 "Effect": "Allow",
@@ -1101,7 +1087,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy44",
+            "PolicyName": "KitchenSinkFunctionRolePolicy43",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1115,7 +1101,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy45",
+            "PolicyName": "KitchenSinkFunctionRolePolicy44",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1136,7 +1122,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy46",
+            "PolicyName": "KitchenSinkFunctionRolePolicy45",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1162,7 +1148,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy47",
+            "PolicyName": "KitchenSinkFunctionRolePolicy46",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1181,7 +1167,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy48",
+            "PolicyName": "KitchenSinkFunctionRolePolicy47",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1202,7 +1188,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy49",
+            "PolicyName": "KitchenSinkFunctionRolePolicy48",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1232,7 +1218,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy50",
+            "PolicyName": "KitchenSinkFunctionRolePolicy49",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1253,7 +1239,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy51",
+            "PolicyName": "KitchenSinkFunctionRolePolicy50",
             "PolicyDocument": {
               "Statement": [
                 {
@@ -1335,7 +1321,7 @@
             }
           },
           {
-            "PolicyName": "KitchenSinkFunctionRolePolicy52",
+            "PolicyName": "KitchenSinkFunctionRolePolicy51",
             "PolicyDocument": {
               "Statement": [
                 {