diff --git a/azure-android-client-authentication/src/main/java/com/microsoft/azure/credentials/AzureEnvironment.java b/azure-android-client-authentication/src/main/java/com/microsoft/azure/credentials/AzureEnvironment.java
index dd8a1a2dc9..ddb02625b0 100644
--- a/azure-android-client-authentication/src/main/java/com/microsoft/azure/credentials/AzureEnvironment.java
+++ b/azure-android-client-authentication/src/main/java/com/microsoft/azure/credentials/AzureEnvironment.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure.credentials;
diff --git a/azure-android-client-authentication/src/main/java/com/microsoft/azure/credentials/UserTokenCredentials.java b/azure-android-client-authentication/src/main/java/com/microsoft/azure/credentials/UserTokenCredentials.java
index f52654e78d..95d0c14f12 100644
--- a/azure-android-client-authentication/src/main/java/com/microsoft/azure/credentials/UserTokenCredentials.java
+++ b/azure-android-client-authentication/src/main/java/com/microsoft/azure/credentials/UserTokenCredentials.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure.credentials;
diff --git a/azure-client-authentication/src/main/java/com/microsoft/azure/credentials/ApplicationTokenCredentials.java b/azure-client-authentication/src/main/java/com/microsoft/azure/credentials/ApplicationTokenCredentials.java
index 3e634f8a5b..77061b8d35 100644
--- a/azure-client-authentication/src/main/java/com/microsoft/azure/credentials/ApplicationTokenCredentials.java
+++ b/azure-client-authentication/src/main/java/com/microsoft/azure/credentials/ApplicationTokenCredentials.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure.credentials;
diff --git a/azure-client-authentication/src/main/java/com/microsoft/azure/credentials/UserTokenCredentials.java b/azure-client-authentication/src/main/java/com/microsoft/azure/credentials/UserTokenCredentials.java
index 55d78ee7f3..75e854e250 100644
--- a/azure-client-authentication/src/main/java/com/microsoft/azure/credentials/UserTokenCredentials.java
+++ b/azure-client-authentication/src/main/java/com/microsoft/azure/credentials/UserTokenCredentials.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure.credentials;
diff --git a/azure-client-authentication/src/test/java/com/microsoft/azure/credentials/UserTokenCredentialsTests.java b/azure-client-authentication/src/test/java/com/microsoft/azure/credentials/UserTokenCredentialsTests.java
index caab41dd8e..38bb383d3a 100644
--- a/azure-client-authentication/src/test/java/com/microsoft/azure/credentials/UserTokenCredentialsTests.java
+++ b/azure-client-authentication/src/test/java/com/microsoft/azure/credentials/UserTokenCredentialsTests.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure.credentials;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/AzureAsyncOperation.java b/azure-client-runtime/src/main/java/com/microsoft/azure/AzureAsyncOperation.java
index 18f56454e9..26ec0a78d8 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/AzureAsyncOperation.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/AzureAsyncOperation.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/AzureClient.java b/azure-client-runtime/src/main/java/com/microsoft/azure/AzureClient.java
index e3b9bc9278..2e65c4e4e2 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/AzureClient.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/AzureClient.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/AzureEnvironment.java b/azure-client-runtime/src/main/java/com/microsoft/azure/AzureEnvironment.java
index d02a1c5261..5e0525c02b 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/AzureEnvironment.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/AzureEnvironment.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/AzureResponseBuilder.java b/azure-client-runtime/src/main/java/com/microsoft/azure/AzureResponseBuilder.java
index d3931cc05e..5c220fb4b4 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/AzureResponseBuilder.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/AzureResponseBuilder.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/AzureServiceCall.java b/azure-client-runtime/src/main/java/com/microsoft/azure/AzureServiceCall.java
index 6aa7f5c88d..74f52c77d9 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/AzureServiceCall.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/AzureServiceCall.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/AzureServiceClient.java b/azure-client-runtime/src/main/java/com/microsoft/azure/AzureServiceClient.java
index 2f1383b2f5..9938c0d509 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/AzureServiceClient.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/AzureServiceClient.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/CloudError.java b/azure-client-runtime/src/main/java/com/microsoft/azure/CloudError.java
index 591909b53b..736054ee1d 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/CloudError.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/CloudError.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/CloudException.java b/azure-client-runtime/src/main/java/com/microsoft/azure/CloudException.java
index 23ae7b4133..42ad60886a 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/CloudException.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/CloudException.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/CustomHeaderInterceptor.java b/azure-client-runtime/src/main/java/com/microsoft/azure/CustomHeaderInterceptor.java
index 7486b838fb..18729404f9 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/CustomHeaderInterceptor.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/CustomHeaderInterceptor.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/ListOperationCallback.java b/azure-client-runtime/src/main/java/com/microsoft/azure/ListOperationCallback.java
index 67fff38d46..af6d96f807 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/ListOperationCallback.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/ListOperationCallback.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/Page.java b/azure-client-runtime/src/main/java/com/microsoft/azure/Page.java
index 28b6f15682..bab2c21656 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/Page.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/Page.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/PagedList.java b/azure-client-runtime/src/main/java/com/microsoft/azure/PagedList.java
index fbd3a21c7f..8f55c5f650 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/PagedList.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/PagedList.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/PollingState.java b/azure-client-runtime/src/main/java/com/microsoft/azure/PollingState.java
index cd3c640ac8..27b64fe34a 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/PollingState.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/PollingState.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/Resource.java b/azure-client-runtime/src/main/java/com/microsoft/azure/Resource.java
index 2f98e586a9..7e8a02a375 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/Resource.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/Resource.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/ResourceGetExponentialBackoffRetryStrategy.java b/azure-client-runtime/src/main/java/com/microsoft/azure/ResourceGetExponentialBackoffRetryStrategy.java
index a145fecc67..72101e342c 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/ResourceGetExponentialBackoffRetryStrategy.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/ResourceGetExponentialBackoffRetryStrategy.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/SubResource.java b/azure-client-runtime/src/main/java/com/microsoft/azure/SubResource.java
index 12bedc30c5..a186f43457 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/SubResource.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/SubResource.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/credentials/AzureTokenCredentials.java b/azure-client-runtime/src/main/java/com/microsoft/azure/credentials/AzureTokenCredentials.java
index d69397b8c2..106f3d75ad 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/credentials/AzureTokenCredentials.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/credentials/AzureTokenCredentials.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure.credentials;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/credentials/AzureTokenCredentialsInterceptor.java b/azure-client-runtime/src/main/java/com/microsoft/azure/credentials/AzureTokenCredentialsInterceptor.java
index ec9cfd4fef..ebcd39571b 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/credentials/AzureTokenCredentialsInterceptor.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/credentials/AzureTokenCredentialsInterceptor.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure.credentials;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/serializer/AzureJacksonAdapter.java b/azure-client-runtime/src/main/java/com/microsoft/azure/serializer/AzureJacksonAdapter.java
index cb3836925f..cad17fcf6f 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/serializer/AzureJacksonAdapter.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/serializer/AzureJacksonAdapter.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure.serializer;
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/serializer/CloudErrorDeserializer.java b/azure-client-runtime/src/main/java/com/microsoft/azure/serializer/CloudErrorDeserializer.java
index ee0a371cf2..3c8f6f06a0 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/serializer/CloudErrorDeserializer.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/serializer/CloudErrorDeserializer.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure.serializer;
diff --git a/azure-client-runtime/src/test/java/com/microsoft/azure/PagedListTests.java b/azure-client-runtime/src/test/java/com/microsoft/azure/PagedListTests.java
index c6b781f7ab..fc1017fc3a 100644
--- a/azure-client-runtime/src/test/java/com/microsoft/azure/PagedListTests.java
+++ b/azure-client-runtime/src/test/java/com/microsoft/azure/PagedListTests.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure;
diff --git a/azure-client-runtime/src/test/java/com/microsoft/azure/RequestIdHeaderInterceptorTests.java b/azure-client-runtime/src/test/java/com/microsoft/azure/RequestIdHeaderInterceptorTests.java
index d9cdff17e8..62d491896b 100644
--- a/azure-client-runtime/src/test/java/com/microsoft/azure/RequestIdHeaderInterceptorTests.java
+++ b/azure-client-runtime/src/test/java/com/microsoft/azure/RequestIdHeaderInterceptorTests.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.azure;
diff --git a/build-tools/src/main/resources/checkstyle.xml b/build-tools/src/main/resources/checkstyle.xml
index d2bc574ee1..400660635d 100644
--- a/build-tools/src/main/resources/checkstyle.xml
+++ b/build-tools/src/main/resources/checkstyle.xml
@@ -40,7 +40,11 @@
         <property name="file" value="${samedir}/suppressions.xml"/>
         <property name="optional" value="true"/>
     </module>
-
+    <module name="Header">
+        <property name="header" value="/**\n * Copyright (c) Microsoft Corporation. All rights reserved.\n * Licensed under the MIT License. See License.txt in the project root for\n * license information.\n"/>
+        <property name="fileExtensions" value="java"/>
+    </module>
+    
     <!--
         If you set the basedir property below, then all reported file
         names will be relative to the specified directory. See
@@ -86,7 +90,9 @@
         <module name="JavadocMethod">
             <property name="scope" value="public"/>
         </module>
-        <module name="JavadocType"/>
+        <module name="JavadocType">
+            <property name="scope" value="public"/>
+        </module>
         <module name="JavadocVariable">
             <property name="scope" value="public"/>
         </module>
diff --git a/build-tools/src/main/resources/suppressions.xml b/build-tools/src/main/resources/suppressions.xml
index 29e5bd66ee..16a6bd2e73 100644
--- a/build-tools/src/main/resources/suppressions.xml
+++ b/build-tools/src/main/resources/suppressions.xml
@@ -35,4 +35,5 @@
     <suppress checks="Javadoc" files=".*Test[s]?\.java"/>
     <suppress checks="Javadoc" files=".*Test[s]?Base\.java"/>
     <suppress checks="Javadoc" files=".*CoverageReporter\.java"/>
+    <suppress checks="Header" files=".*package-info.java"/>
 </suppressions>
\ No newline at end of file
diff --git a/client-runtime/src/main/java/com/microsoft/rest/Base64Url.java b/client-runtime/src/main/java/com/microsoft/rest/Base64Url.java
index bc8a2bc637..90a9682afc 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/Base64Url.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/Base64Url.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/CollectionFormat.java b/client-runtime/src/main/java/com/microsoft/rest/CollectionFormat.java
index 833441272b..5bd6155bbf 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/CollectionFormat.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/CollectionFormat.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/DateTimeRfc1123.java b/client-runtime/src/main/java/com/microsoft/rest/DateTimeRfc1123.java
index 035c80b1ef..4201472f6b 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/DateTimeRfc1123.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/DateTimeRfc1123.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/LogLevel.java b/client-runtime/src/main/java/com/microsoft/rest/LogLevel.java
index 1760352509..2b3b4da7bf 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/LogLevel.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/LogLevel.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/RestClient.java b/client-runtime/src/main/java/com/microsoft/rest/RestClient.java
index 6a3651edc7..a643103674 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/RestClient.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/RestClient.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/RestException.java b/client-runtime/src/main/java/com/microsoft/rest/RestException.java
index bcc81544af..5e736e560f 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/RestException.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/RestException.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/ServiceCall.java b/client-runtime/src/main/java/com/microsoft/rest/ServiceCall.java
index f6a0e4dc42..0b75d299ca 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/ServiceCall.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/ServiceCall.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/ServiceCallback.java b/client-runtime/src/main/java/com/microsoft/rest/ServiceCallback.java
index 33aa466723..186a3364b7 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/ServiceCallback.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/ServiceCallback.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java b/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java
index a0a5d1a221..cfb11076c3 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/ServiceResponse.java b/client-runtime/src/main/java/com/microsoft/rest/ServiceResponse.java
index 42319a37ec..59da88eb3f 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/ServiceResponse.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/ServiceResponse.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/ServiceResponseBuilder.java b/client-runtime/src/main/java/com/microsoft/rest/ServiceResponseBuilder.java
index 9d672deaec..e1851f4707 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/ServiceResponseBuilder.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/ServiceResponseBuilder.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/ServiceResponseWithHeaders.java b/client-runtime/src/main/java/com/microsoft/rest/ServiceResponseWithHeaders.java
index a60a815ed5..903b00f4df 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/ServiceResponseWithHeaders.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/ServiceResponseWithHeaders.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/Validator.java b/client-runtime/src/main/java/com/microsoft/rest/Validator.java
index c654d32305..0beb543878 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/Validator.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/Validator.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/credentials/BasicAuthenticationCredentials.java b/client-runtime/src/main/java/com/microsoft/rest/credentials/BasicAuthenticationCredentials.java
index c63133e128..1e1a442967 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/credentials/BasicAuthenticationCredentials.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/credentials/BasicAuthenticationCredentials.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.credentials;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/credentials/BasicAuthenticationCredentialsInterceptor.java b/client-runtime/src/main/java/com/microsoft/rest/credentials/BasicAuthenticationCredentialsInterceptor.java
index 4d35226e17..fdc589c0de 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/credentials/BasicAuthenticationCredentialsInterceptor.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/credentials/BasicAuthenticationCredentialsInterceptor.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.credentials;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/credentials/ServiceClientCredentials.java b/client-runtime/src/main/java/com/microsoft/rest/credentials/ServiceClientCredentials.java
index 89d15a9d75..06b5a14fb0 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/credentials/ServiceClientCredentials.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/credentials/ServiceClientCredentials.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.credentials;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/credentials/TokenCredentials.java b/client-runtime/src/main/java/com/microsoft/rest/credentials/TokenCredentials.java
index 403083eedc..09f5097207 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/credentials/TokenCredentials.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/credentials/TokenCredentials.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.credentials;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/credentials/TokenCredentialsInterceptor.java b/client-runtime/src/main/java/com/microsoft/rest/credentials/TokenCredentialsInterceptor.java
index 2054c5a6e2..1f346db084 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/credentials/TokenCredentialsInterceptor.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/credentials/TokenCredentialsInterceptor.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.credentials;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/interceptors/BaseUrlHandler.java b/client-runtime/src/main/java/com/microsoft/rest/interceptors/BaseUrlHandler.java
index d8b0f15c33..425d0a37b6 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/interceptors/BaseUrlHandler.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/interceptors/BaseUrlHandler.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.interceptors;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/interceptors/CustomHeadersInterceptor.java b/client-runtime/src/main/java/com/microsoft/rest/interceptors/CustomHeadersInterceptor.java
index deddfa8d50..bc689f7928 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/interceptors/CustomHeadersInterceptor.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/interceptors/CustomHeadersInterceptor.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.interceptors;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/interceptors/LoggingInterceptor.java b/client-runtime/src/main/java/com/microsoft/rest/interceptors/LoggingInterceptor.java
index 7efb856b9a..e5bc441f82 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/interceptors/LoggingInterceptor.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/interceptors/LoggingInterceptor.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.interceptors;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/interceptors/RequestIdHeaderInterceptor.java b/client-runtime/src/main/java/com/microsoft/rest/interceptors/RequestIdHeaderInterceptor.java
index c34179cabb..df79cfde28 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/interceptors/RequestIdHeaderInterceptor.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/interceptors/RequestIdHeaderInterceptor.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.interceptors;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/interceptors/UserAgentInterceptor.java b/client-runtime/src/main/java/com/microsoft/rest/interceptors/UserAgentInterceptor.java
index a4b4d1506e..8410a51986 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/interceptors/UserAgentInterceptor.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/interceptors/UserAgentInterceptor.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.interceptors;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/protocol/Environment.java b/client-runtime/src/main/java/com/microsoft/rest/protocol/Environment.java
index 2c9eeea422..b397d2f534 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/protocol/Environment.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/protocol/Environment.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.protocol;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/protocol/ResponseBuilder.java b/client-runtime/src/main/java/com/microsoft/rest/protocol/ResponseBuilder.java
index e357a2078f..6b7f060bd5 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/protocol/ResponseBuilder.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/protocol/ResponseBuilder.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.protocol;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/protocol/SerializerAdapter.java b/client-runtime/src/main/java/com/microsoft/rest/protocol/SerializerAdapter.java
index a1247fc07e..ee27cc23fc 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/protocol/SerializerAdapter.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/protocol/SerializerAdapter.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.protocol;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/retry/ExponentialBackoffRetryStrategy.java b/client-runtime/src/main/java/com/microsoft/rest/retry/ExponentialBackoffRetryStrategy.java
index 1af917a4eb..5a689cc09e 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/retry/ExponentialBackoffRetryStrategy.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/retry/ExponentialBackoffRetryStrategy.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.retry;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/retry/RetryHandler.java b/client-runtime/src/main/java/com/microsoft/rest/retry/RetryHandler.java
index 586673e513..336f2aa072 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/retry/RetryHandler.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/retry/RetryHandler.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.retry;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/retry/RetryStrategy.java b/client-runtime/src/main/java/com/microsoft/rest/retry/RetryStrategy.java
index d5002a5a2e..026a874bcf 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/retry/RetryStrategy.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/retry/RetryStrategy.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.retry;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/serializer/Base64UrlSerializer.java b/client-runtime/src/main/java/com/microsoft/rest/serializer/Base64UrlSerializer.java
index 757ab735e2..53021fd471 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/serializer/Base64UrlSerializer.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/serializer/Base64UrlSerializer.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.serializer;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/serializer/ByteArraySerializer.java b/client-runtime/src/main/java/com/microsoft/rest/serializer/ByteArraySerializer.java
index e32093a1c1..90dc51873b 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/serializer/ByteArraySerializer.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/serializer/ByteArraySerializer.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.serializer;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/serializer/DateTimeRfc1123Serializer.java b/client-runtime/src/main/java/com/microsoft/rest/serializer/DateTimeRfc1123Serializer.java
index a08a9b2a75..e4e3e5c09b 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/serializer/DateTimeRfc1123Serializer.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/serializer/DateTimeRfc1123Serializer.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.serializer;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/serializer/DateTimeSerializer.java b/client-runtime/src/main/java/com/microsoft/rest/serializer/DateTimeSerializer.java
index 30dc795a41..0b158bcfdf 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/serializer/DateTimeSerializer.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/serializer/DateTimeSerializer.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.serializer;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/serializer/FlatteningDeserializer.java b/client-runtime/src/main/java/com/microsoft/rest/serializer/FlatteningDeserializer.java
index 57dcfa94d5..9ef05a7b07 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/serializer/FlatteningDeserializer.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/serializer/FlatteningDeserializer.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.serializer;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/serializer/FlatteningSerializer.java b/client-runtime/src/main/java/com/microsoft/rest/serializer/FlatteningSerializer.java
index dd371be5fe..3e0c2328aa 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/serializer/FlatteningSerializer.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/serializer/FlatteningSerializer.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.serializer;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/serializer/HeadersSerializer.java b/client-runtime/src/main/java/com/microsoft/rest/serializer/HeadersSerializer.java
index a0b109a0fe..be694e9688 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/serializer/HeadersSerializer.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/serializer/HeadersSerializer.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.serializer;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/serializer/JacksonAdapter.java b/client-runtime/src/main/java/com/microsoft/rest/serializer/JacksonAdapter.java
index 695eb54576..63d9e82d28 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/serializer/JacksonAdapter.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/serializer/JacksonAdapter.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.serializer;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/serializer/JacksonConverterFactory.java b/client-runtime/src/main/java/com/microsoft/rest/serializer/JacksonConverterFactory.java
index 96749a19c9..6ba0ebe4d6 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/serializer/JacksonConverterFactory.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/serializer/JacksonConverterFactory.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.serializer;
diff --git a/client-runtime/src/main/java/com/microsoft/rest/serializer/JsonFlatten.java b/client-runtime/src/main/java/com/microsoft/rest/serializer/JsonFlatten.java
index 070447cad9..4f442271d1 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/serializer/JsonFlatten.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/serializer/JsonFlatten.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest.serializer;
diff --git a/client-runtime/src/test/java/com/microsoft/rest/CredentialsTests.java b/client-runtime/src/test/java/com/microsoft/rest/CredentialsTests.java
index d21de3ef9b..d3015b4137 100644
--- a/client-runtime/src/test/java/com/microsoft/rest/CredentialsTests.java
+++ b/client-runtime/src/test/java/com/microsoft/rest/CredentialsTests.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest;
diff --git a/client-runtime/src/test/java/com/microsoft/rest/RetryHandlerTests.java b/client-runtime/src/test/java/com/microsoft/rest/RetryHandlerTests.java
index 068e57b214..a34db93d7e 100644
--- a/client-runtime/src/test/java/com/microsoft/rest/RetryHandlerTests.java
+++ b/client-runtime/src/test/java/com/microsoft/rest/RetryHandlerTests.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest;
diff --git a/client-runtime/src/test/java/com/microsoft/rest/ServiceClientTests.java b/client-runtime/src/test/java/com/microsoft/rest/ServiceClientTests.java
index 9d76292d20..1e24ba8ad9 100644
--- a/client-runtime/src/test/java/com/microsoft/rest/ServiceClientTests.java
+++ b/client-runtime/src/test/java/com/microsoft/rest/ServiceClientTests.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest;
diff --git a/client-runtime/src/test/java/com/microsoft/rest/UserAgentTests.java b/client-runtime/src/test/java/com/microsoft/rest/UserAgentTests.java
index b5726263d7..701050e925 100644
--- a/client-runtime/src/test/java/com/microsoft/rest/UserAgentTests.java
+++ b/client-runtime/src/test/java/com/microsoft/rest/UserAgentTests.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest;
diff --git a/client-runtime/src/test/java/com/microsoft/rest/ValidatorTests.java b/client-runtime/src/test/java/com/microsoft/rest/ValidatorTests.java
index 5120c33df0..4b28d01fa6 100644
--- a/client-runtime/src/test/java/com/microsoft/rest/ValidatorTests.java
+++ b/client-runtime/src/test/java/com/microsoft/rest/ValidatorTests.java
@@ -1,8 +1,7 @@
 /**
- *
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
  */
 
 package com.microsoft.rest;