diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/disk.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/disk.json
index 4f5ab9319edf..8c1bd8b7f0a2 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/disk.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/disk.json
@@ -1331,11 +1331,6 @@
           "readOnly": true,
           "type": "string",
           "description": "The disk encryption set provisioning state."
-        },
-        "uniqueId": {
-          "type": "string",
-          "readOnly": true,
-          "description": "Unique Guid identifying the resource."
         }
       }
     },
@@ -1448,7 +1443,6 @@
         }
       },
       "required": [
-        "diskEncryptionSetId",
         "type"
       ],
       "description": "Encryption at rest settings for disk or snapshot"
diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/GetInformationAboutAManagedDisk.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/GetInformationAboutAManagedDisk.json
index 909801d2ed4c..7b81f6786542 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/GetInformationAboutAManagedDisk.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/GetInformationAboutAManagedDisk.json
@@ -37,6 +37,9 @@
               }
             ]
           },
+          "encryption": {
+            "type": "EncryptionAtRestWithPlatformKey"
+          },
           "timeCreated": "2016-12-28T04:41:35.079872+00:00",
           "provisioningState": "Succeeded"
         },
diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/GetInformationAboutASnapshot.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/GetInformationAboutASnapshot.json
index b0d55d239a8e..dbfb784cc43d 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/GetInformationAboutASnapshot.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/GetInformationAboutASnapshot.json
@@ -33,6 +33,9 @@
               }
             ]
           },
+          "encryption": {
+            "type": "EncryptionAtRestWithPlatformKey"
+          },
           "timeCreated": "2016-12-28T04:41:35.079872+00:00",
           "provisioningState": "Succeeded"
         },
diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/ListManagedDisksInAResourceGroup.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/ListManagedDisksInAResourceGroup.json
index 25fe16ce9b64..84c83692e04e 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/ListManagedDisksInAResourceGroup.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/ListManagedDisksInAResourceGroup.json
@@ -35,6 +35,9 @@
                   }
                 ]
               },
+              "encryption": {
+                "type": "EncryptionAtRestWithPlatformKey"
+              },
               "timeCreated": "2016-12-28T04:41:35.9278721+00:00",
               "provisioningState": "Succeeded"
             },
@@ -45,7 +48,7 @@
               "project": "ManagedDisks"
             },
             "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myManagedDisk",
-            "name": "myManagedDisk"
+            "name": "myManagedDisk1"
           },
           {
             "properties": {
@@ -54,13 +57,16 @@
                 "createOption": "Empty"
               },
               "diskSizeGB": 10,
+              "encryption": {
+                "type": "EncryptionAtRestWithPlatformKey"
+              },
               "timeCreated": "2016-12-28T04:41:36.872242+00:00",
               "provisioningState": "Succeeded"
             },
             "type": "Microsoft.Compute/disks",
             "location": "westus",
             "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myManagedDisk",
-            "name": "myManagedDisk"
+            "name": "myManagedDisk2"
           },
           {
             "properties": {
@@ -91,6 +97,9 @@
                   }
                 ]
               },
+              "encryption": {
+                "type": "EncryptionAtRestWithPlatformKey"
+              },
               "timeCreated": "2016-12-28T04:41:36.3973934+00:00",
               "provisioningState": "Succeeded"
             },
@@ -101,7 +110,7 @@
               "project": "ManagedDisks"
             },
             "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myManagedDisk",
-            "name": "myManagedDisk"
+            "name": "myManagedDisk3"
           }
         ],
         "nextLink": "http://disksvchost:99/subscriptions/{subscriptionId}/providers/Microsoft.Compute/disks?$skiptoken={token}/Subscriptions/{subscriptionId}/ResourceGroups/myResourceGroup/Disks/myManagedDisk"
diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/ListManagedDisksInASubscription.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/ListManagedDisksInASubscription.json
index 955d0f7a7f4b..49e05b8e5583 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/ListManagedDisksInASubscription.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/ListManagedDisksInASubscription.json
@@ -34,6 +34,9 @@
                   }
                 ]
               },
+              "encryption": {
+                "type": "EncryptionAtRestWithPlatformKey"
+              },
               "timeCreated": "2016-12-28T04:41:35.9278721+00:00",
               "provisioningState": "Succeeded"
             },
@@ -53,6 +56,9 @@
                 "createOption": "Empty"
               },
               "diskSizeGB": 10,
+              "encryption": {
+                "type": "EncryptionAtRestWithPlatformKey"
+              },
               "timeCreated": "2016-12-28T04:41:36.872242+00:00",
               "provisioningState": "Succeeded"
             },
@@ -90,6 +96,9 @@
                   }
                 ]
               },
+              "encryption": {
+                "type": "EncryptionAtRestWithPlatformKey"
+              },
               "timeCreated": "2016-12-28T04:41:36.3973934+00:00",
               "provisioningState": "Succeeded"
             },
diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/ListSnapshotsInAResourceGroup.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/ListSnapshotsInAResourceGroup.json
index f8bad5602b20..843b2fe788d7 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/ListSnapshotsInAResourceGroup.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/ListSnapshotsInAResourceGroup.json
@@ -35,6 +35,9 @@
                   }
                 ]
               },
+              "encryption": {
+                "type": "EncryptionAtRestWithPlatformKey"
+              },
               "timeCreated": "2016-12-28T04:41:35.9278721+00:00",
               "provisioningState": "Succeeded"
             },
diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/ListSnapshotsInASubscription.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/ListSnapshotsInASubscription.json
index 34250c2a3010..e833eabfade5 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/ListSnapshotsInASubscription.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/examples/ListSnapshotsInASubscription.json
@@ -34,6 +34,9 @@
                   }
                 ]
               },
+              "encryption": {
+                "type": "EncryptionAtRestWithPlatformKey"
+              },
               "timeCreated": "2016-12-28T04:47:30.6630569+00:00",
               "provisioningState": "Succeeded"
             },
@@ -74,6 +77,9 @@
                   }
                 ]
               },
+              "encryption": {
+                "type": "EncryptionAtRestWithPlatformKey"
+              },
               "timeCreated": "2016-12-28T04:47:30.3247198+00:00",
               "provisioningState": "Succeeded"
             },