diff --git a/sdk/policy/mgmt-v2016_12_01/pom.xml b/sdk/policy/mgmt-v2016_12_01/pom.xml
index c1b7473944c12..ce455fda93353 100644
--- a/sdk/policy/mgmt-v2016_12_01/pom.xml
+++ b/sdk/policy/mgmt-v2016_12_01/pom.xml
@@ -11,15 +11,15 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.3.0</version>
-        <relativePath>../../parents/azure-arm-parent</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-policy</artifactId>
-    <version>1.0.0-beta-2</version>
+    <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for Authorization Management</name>
     <description>This package contains Microsoft Authorization Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <url>https://github.com/Azure/azure-sdk-for-java</url>
     <licenses>
         <license>
             <name>The MIT License (MIT)</name>
@@ -28,8 +28,8 @@
         </license>
     </licenses>
     <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
         <tag>HEAD</tag>
     </scm>
     <properties>
@@ -71,6 +71,8 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/PolicyAssignment.java b/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/PolicyAssignment.java
index e682d922d322b..53125a6564f9f 100644
--- a/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/PolicyAssignment.java
+++ b/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/PolicyAssignment.java
@@ -84,6 +84,8 @@ interface Blank extends WithScope {
         interface WithScope {
            /**
             * Specifies scope.
+            * @param scope The scope of the policy assignment
+            * @return the next definition stage
             */
             WithCreate withScope(String scope);
         }
@@ -94,6 +96,8 @@ interface WithScope {
         interface WithDescription {
             /**
              * Specifies description.
+             * @param description This message will be part of response in case of policy violation
+             * @return the next definition stage
              */
             WithCreate withDescription(String description);
         }
@@ -104,6 +108,8 @@ interface WithDescription {
         interface WithDisplayName {
             /**
              * Specifies displayName.
+             * @param displayName The display name of the policy assignment
+             * @return the next definition stage
              */
             WithCreate withDisplayName(String displayName);
         }
@@ -114,6 +120,8 @@ interface WithDisplayName {
         interface WithParameters {
             /**
              * Specifies parameters.
+             * @param parameters Required if a parameter is used in policy rule
+             * @return the next definition stage
              */
             WithCreate withParameters(Object parameters);
         }
@@ -124,6 +132,8 @@ interface WithParameters {
         interface WithPolicyDefinitionId {
             /**
              * Specifies policyDefinitionId.
+             * @param policyDefinitionId The ID of the policy definition
+             * @return the next definition stage
              */
             WithCreate withPolicyDefinitionId(String policyDefinitionId);
         }
@@ -134,6 +144,8 @@ interface WithPolicyDefinitionId {
         interface WithScopeProperty {
             /**
              * Specifies scopeProperty.
+             * @param scopeProperty The scope for the policy assignment
+             * @return the next definition stage
              */
             WithCreate withScopeProperty(String scopeProperty);
         }
@@ -162,6 +174,8 @@ interface UpdateStages {
         interface WithDescription {
             /**
              * Specifies description.
+             * @param description This message will be part of response in case of policy violation
+             * @return the next update stage
              */
             Update withDescription(String description);
         }
@@ -172,6 +186,8 @@ interface WithDescription {
         interface WithDisplayName {
             /**
              * Specifies displayName.
+             * @param displayName The display name of the policy assignment
+             * @return the next update stage
              */
             Update withDisplayName(String displayName);
         }
@@ -182,6 +198,8 @@ interface WithDisplayName {
         interface WithParameters {
             /**
              * Specifies parameters.
+             * @param parameters Required if a parameter is used in policy rule
+             * @return the next update stage
              */
             Update withParameters(Object parameters);
         }
@@ -192,6 +210,8 @@ interface WithParameters {
         interface WithPolicyDefinitionId {
             /**
              * Specifies policyDefinitionId.
+             * @param policyDefinitionId The ID of the policy definition
+             * @return the next update stage
              */
             Update withPolicyDefinitionId(String policyDefinitionId);
         }
@@ -202,6 +222,8 @@ interface WithPolicyDefinitionId {
         interface WithScopeProperty {
             /**
              * Specifies scopeProperty.
+             * @param scopeProperty The scope for the policy assignment
+             * @return the next update stage
              */
             Update withScopeProperty(String scopeProperty);
         }
diff --git a/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/PolicyAssignments.java b/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/PolicyAssignments.java
index cabdc102fa344..9e9ecbad2ce1f 100644
--- a/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/PolicyAssignments.java
+++ b/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/PolicyAssignments.java
@@ -56,7 +56,7 @@ public interface PolicyAssignments extends SupportsCreating<PolicyAssignment.Def
 
     /**
      * Deletes a policy assignment by ID.
-     * When providing a scope for the assigment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
+     * When providing a scope for the assignment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
      *
      * @param policyAssignmentId The ID of the policy assignment to delete. Use the format '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -66,7 +66,7 @@ public interface PolicyAssignments extends SupportsCreating<PolicyAssignment.Def
 
     /**
      * Creates a policy assignment by ID.
-     * Policy assignments are inherited by child resources. For example, when you apply a policy to a resource group that policy is assigned to all resources in the group. When providing a scope for the assigment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
+     * Policy assignments are inherited by child resources. For example, when you apply a policy to a resource group that policy is assigned to all resources in the group. When providing a scope for the assignment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
      *
      * @param policyAssignmentId The ID of the policy assignment to create. Use the format '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'.
      * @param parameters Parameters for policy assignment.
@@ -77,7 +77,7 @@ public interface PolicyAssignments extends SupportsCreating<PolicyAssignment.Def
 
     /**
      * Gets a policy assignment by ID.
-     * When providing a scope for the assigment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
+     * When providing a scope for the assignment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
      *
      * @param policyAssignmentId The ID of the policy assignment to get. Use the format '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
diff --git a/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/PolicyDefinition.java b/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/PolicyDefinition.java
index 40cc935199dd6..0b29cae9b5c74 100644
--- a/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/PolicyDefinition.java
+++ b/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/PolicyDefinition.java
@@ -89,6 +89,8 @@ interface Blank extends WithCreate {
         interface WithDescription {
             /**
              * Specifies description.
+             * @param description The policy definition description
+             * @return the next definition stage
              */
             WithCreate withDescription(String description);
         }
@@ -99,6 +101,8 @@ interface WithDescription {
         interface WithDisplayName {
             /**
              * Specifies displayName.
+             * @param displayName The display name of the policy definition
+             * @return the next definition stage
              */
             WithCreate withDisplayName(String displayName);
         }
@@ -109,6 +113,8 @@ interface WithDisplayName {
         interface WithMetadata {
             /**
              * Specifies metadata.
+             * @param metadata The policy definition metadata
+             * @return the next definition stage
              */
             WithCreate withMetadata(Object metadata);
         }
@@ -119,6 +125,8 @@ interface WithMetadata {
         interface WithMode {
             /**
              * Specifies mode.
+             * @param mode The policy definition mode. Possible values are NotSpecified, Indexed, and All. Possible values include: 'NotSpecified', 'Indexed', 'All'
+             * @return the next definition stage
              */
             WithCreate withMode(PolicyMode mode);
         }
@@ -129,6 +137,8 @@ interface WithMode {
         interface WithParameters {
             /**
              * Specifies parameters.
+             * @param parameters Required if a parameter is used in policy rule
+             * @return the next definition stage
              */
             WithCreate withParameters(Object parameters);
         }
@@ -139,6 +149,8 @@ interface WithParameters {
         interface WithPolicyRule {
             /**
              * Specifies policyRule.
+             * @param policyRule The policy rule
+             * @return the next definition stage
              */
             WithCreate withPolicyRule(Object policyRule);
         }
@@ -149,6 +161,8 @@ interface WithPolicyRule {
         interface WithPolicyType {
             /**
              * Specifies policyType.
+             * @param policyType The type of policy definition. Possible values are NotSpecified, BuiltIn, and Custom. Possible values include: 'NotSpecified', 'BuiltIn', 'Custom'
+             * @return the next definition stage
              */
             WithCreate withPolicyType(PolicyType policyType);
         }
@@ -177,6 +191,8 @@ interface UpdateStages {
         interface WithDescription {
             /**
              * Specifies description.
+             * @param description The policy definition description
+             * @return the next update stage
              */
             Update withDescription(String description);
         }
@@ -187,6 +203,8 @@ interface WithDescription {
         interface WithDisplayName {
             /**
              * Specifies displayName.
+             * @param displayName The display name of the policy definition
+             * @return the next update stage
              */
             Update withDisplayName(String displayName);
         }
@@ -197,6 +215,8 @@ interface WithDisplayName {
         interface WithMetadata {
             /**
              * Specifies metadata.
+             * @param metadata The policy definition metadata
+             * @return the next update stage
              */
             Update withMetadata(Object metadata);
         }
@@ -207,6 +227,8 @@ interface WithMetadata {
         interface WithMode {
             /**
              * Specifies mode.
+             * @param mode The policy definition mode. Possible values are NotSpecified, Indexed, and All. Possible values include: 'NotSpecified', 'Indexed', 'All'
+             * @return the next update stage
              */
             Update withMode(PolicyMode mode);
         }
@@ -217,6 +239,8 @@ interface WithMode {
         interface WithParameters {
             /**
              * Specifies parameters.
+             * @param parameters Required if a parameter is used in policy rule
+             * @return the next update stage
              */
             Update withParameters(Object parameters);
         }
@@ -227,6 +251,8 @@ interface WithParameters {
         interface WithPolicyRule {
             /**
              * Specifies policyRule.
+             * @param policyRule The policy rule
+             * @return the next update stage
              */
             Update withPolicyRule(Object policyRule);
         }
@@ -237,6 +263,8 @@ interface WithPolicyRule {
         interface WithPolicyType {
             /**
              * Specifies policyType.
+             * @param policyType The type of policy definition. Possible values are NotSpecified, BuiltIn, and Custom. Possible values include: 'NotSpecified', 'BuiltIn', 'Custom'
+             * @return the next update stage
              */
             Update withPolicyType(PolicyType policyType);
         }
diff --git a/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/implementation/PolicyAssignmentImpl.java b/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/implementation/PolicyAssignmentImpl.java
index 48bef3c82fb26..e7f5744c770d6 100644
--- a/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/implementation/PolicyAssignmentImpl.java
+++ b/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/implementation/PolicyAssignmentImpl.java
@@ -31,10 +31,10 @@ class PolicyAssignmentImpl extends CreatableUpdatableImpl<PolicyAssignment, Poli
         this.manager = manager;
         // Set resource name
         this.policyAssignmentName = inner.name();
-        // resource ancestor names
+        // set resource ancestor and positional variables
         this.policyAssignmentName = IdParsingUtils.getValueFromIdByName(inner.id(), "policyAssignments");
         this.scope = IdParsingUtils.getValueFromIdByPosition(inner.id(), 0);
-        //
+        // set other parameters for create and update
     }
 
     @Override
diff --git a/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/implementation/PolicyAssignmentsInner.java b/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/implementation/PolicyAssignmentsInner.java
index 2d2f9c1333a7a..7e475042efb48 100644
--- a/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/implementation/PolicyAssignmentsInner.java
+++ b/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/implementation/PolicyAssignmentsInner.java
@@ -1112,7 +1112,7 @@ private ServiceResponse<PageImpl<PolicyAssignmentInner>> listDelegate(Response<R
 
     /**
      * Deletes a policy assignment by ID.
-     * When providing a scope for the assigment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
+     * When providing a scope for the assignment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
      *
      * @param policyAssignmentId The ID of the policy assignment to delete. Use the format '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -1126,7 +1126,7 @@ public PolicyAssignmentInner deleteById(String policyAssignmentId) {
 
     /**
      * Deletes a policy assignment by ID.
-     * When providing a scope for the assigment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
+     * When providing a scope for the assignment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
      *
      * @param policyAssignmentId The ID of the policy assignment to delete. Use the format '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -1139,7 +1139,7 @@ public ServiceFuture<PolicyAssignmentInner> deleteByIdAsync(String policyAssignm
 
     /**
      * Deletes a policy assignment by ID.
-     * When providing a scope for the assigment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
+     * When providing a scope for the assignment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
      *
      * @param policyAssignmentId The ID of the policy assignment to delete. Use the format '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -1156,7 +1156,7 @@ public PolicyAssignmentInner call(ServiceResponse<PolicyAssignmentInner> respons
 
     /**
      * Deletes a policy assignment by ID.
-     * When providing a scope for the assigment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
+     * When providing a scope for the assignment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
      *
      * @param policyAssignmentId The ID of the policy assignment to delete. Use the format '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -1192,7 +1192,7 @@ private ServiceResponse<PolicyAssignmentInner> deleteByIdDelegate(Response<Respo
 
     /**
      * Creates a policy assignment by ID.
-     * Policy assignments are inherited by child resources. For example, when you apply a policy to a resource group that policy is assigned to all resources in the group. When providing a scope for the assigment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
+     * Policy assignments are inherited by child resources. For example, when you apply a policy to a resource group that policy is assigned to all resources in the group. When providing a scope for the assignment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
      *
      * @param policyAssignmentId The ID of the policy assignment to create. Use the format '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'.
      * @param parameters Parameters for policy assignment.
@@ -1207,7 +1207,7 @@ public PolicyAssignmentInner createById(String policyAssignmentId, PolicyAssignm
 
     /**
      * Creates a policy assignment by ID.
-     * Policy assignments are inherited by child resources. For example, when you apply a policy to a resource group that policy is assigned to all resources in the group. When providing a scope for the assigment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
+     * Policy assignments are inherited by child resources. For example, when you apply a policy to a resource group that policy is assigned to all resources in the group. When providing a scope for the assignment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
      *
      * @param policyAssignmentId The ID of the policy assignment to create. Use the format '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'.
      * @param parameters Parameters for policy assignment.
@@ -1221,7 +1221,7 @@ public ServiceFuture<PolicyAssignmentInner> createByIdAsync(String policyAssignm
 
     /**
      * Creates a policy assignment by ID.
-     * Policy assignments are inherited by child resources. For example, when you apply a policy to a resource group that policy is assigned to all resources in the group. When providing a scope for the assigment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
+     * Policy assignments are inherited by child resources. For example, when you apply a policy to a resource group that policy is assigned to all resources in the group. When providing a scope for the assignment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
      *
      * @param policyAssignmentId The ID of the policy assignment to create. Use the format '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'.
      * @param parameters Parameters for policy assignment.
@@ -1239,7 +1239,7 @@ public PolicyAssignmentInner call(ServiceResponse<PolicyAssignmentInner> respons
 
     /**
      * Creates a policy assignment by ID.
-     * Policy assignments are inherited by child resources. For example, when you apply a policy to a resource group that policy is assigned to all resources in the group. When providing a scope for the assigment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
+     * Policy assignments are inherited by child resources. For example, when you apply a policy to a resource group that policy is assigned to all resources in the group. When providing a scope for the assignment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
      *
      * @param policyAssignmentId The ID of the policy assignment to create. Use the format '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'.
      * @param parameters Parameters for policy assignment.
@@ -1280,7 +1280,7 @@ private ServiceResponse<PolicyAssignmentInner> createByIdDelegate(Response<Respo
 
     /**
      * Gets a policy assignment by ID.
-     * When providing a scope for the assigment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
+     * When providing a scope for the assignment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
      *
      * @param policyAssignmentId The ID of the policy assignment to get. Use the format '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -1294,7 +1294,7 @@ public PolicyAssignmentInner getById(String policyAssignmentId) {
 
     /**
      * Gets a policy assignment by ID.
-     * When providing a scope for the assigment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
+     * When providing a scope for the assignment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
      *
      * @param policyAssignmentId The ID of the policy assignment to get. Use the format '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -1307,7 +1307,7 @@ public ServiceFuture<PolicyAssignmentInner> getByIdAsync(String policyAssignment
 
     /**
      * Gets a policy assignment by ID.
-     * When providing a scope for the assigment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
+     * When providing a scope for the assignment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
      *
      * @param policyAssignmentId The ID of the policy assignment to get. Use the format '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -1324,7 +1324,7 @@ public PolicyAssignmentInner call(ServiceResponse<PolicyAssignmentInner> respons
 
     /**
      * Gets a policy assignment by ID.
-     * When providing a scope for the assigment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
+     * When providing a scope for the assignment, use '/subscriptions/{subscription-id}/' for subscriptions, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for resource groups, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider-namespace}/{resource-type}/{resource-name}' for resources.
      *
      * @param policyAssignmentId The ID of the policy assignment to get. Use the format '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
diff --git a/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/implementation/PolicyClientImpl.java b/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/implementation/PolicyClientImpl.java
index 3dde62ee59924..71ccaf379d555 100644
--- a/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/implementation/PolicyClientImpl.java
+++ b/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/implementation/PolicyClientImpl.java
@@ -63,11 +63,11 @@ public String apiVersion() {
         return this.apiVersion;
     }
 
-    /** Gets or sets the preferred language for the response. */
+    /** The preferred language for the response. */
     private String acceptLanguage;
 
     /**
-     * Gets Gets or sets the preferred language for the response.
+     * Gets The preferred language for the response.
      *
      * @return the acceptLanguage value.
      */
@@ -76,7 +76,7 @@ public String acceptLanguage() {
     }
 
     /**
-     * Sets Gets or sets the preferred language for the response.
+     * Sets The preferred language for the response.
      *
      * @param acceptLanguage the acceptLanguage value.
      * @return the service client itself
@@ -86,11 +86,11 @@ public PolicyClientImpl withAcceptLanguage(String acceptLanguage) {
         return this;
     }
 
-    /** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
+    /** The retry timeout in seconds for Long Running Operations. Default value is 30. */
     private int longRunningOperationRetryTimeout;
 
     /**
-     * Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     * Gets The retry timeout in seconds for Long Running Operations. Default value is 30.
      *
      * @return the longRunningOperationRetryTimeout value.
      */
@@ -99,7 +99,7 @@ public int longRunningOperationRetryTimeout() {
     }
 
     /**
-     * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     * Sets The retry timeout in seconds for Long Running Operations. Default value is 30.
      *
      * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
      * @return the service client itself
@@ -109,11 +109,11 @@ public PolicyClientImpl withLongRunningOperationRetryTimeout(int longRunningOper
         return this;
     }
 
-    /** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
+    /** Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
     private boolean generateClientRequestId;
 
     /**
-     * Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     * Gets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
      *
      * @return the generateClientRequestId value.
      */
@@ -122,7 +122,7 @@ public boolean generateClientRequestId() {
     }
 
     /**
-     * Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     * Sets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
      *
      * @param generateClientRequestId the generateClientRequestId value.
      * @return the service client itself
@@ -205,6 +205,6 @@ protected void initialize() {
      */
     @Override
     public String userAgent() {
-        return String.format("%s (%s, %s)", super.userAgent(), "PolicyClient", "2016-12-01");
+        return String.format("%s (%s, %s, auto-generated)", super.userAgent(), "PolicyClient", "2016-12-01");
     }
 }
diff --git a/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/implementation/PolicyDefinitionImpl.java b/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/implementation/PolicyDefinitionImpl.java
index 9bb8daa067261..6edb014a0d0f8 100644
--- a/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/implementation/PolicyDefinitionImpl.java
+++ b/sdk/policy/mgmt-v2016_12_01/src/main/java/com/microsoft/azure/management/policy/v2016_12_01/implementation/PolicyDefinitionImpl.java
@@ -32,9 +32,9 @@ class PolicyDefinitionImpl extends CreatableUpdatableImpl<PolicyDefinition, Poli
         this.manager = manager;
         // Set resource name
         this.policyDefinitionName = inner.name();
-        // resource ancestor names
+        // set resource ancestor and positional variables
         this.policyDefinitionName = IdParsingUtils.getValueFromIdByName(inner.id(), "policyDefinitions");
-        //
+        // set other parameters for create and update
     }
 
     @Override