diff --git a/sdk/storage/arm-storage/LICENSE.txt b/sdk/storage/arm-storage/LICENSE.txt
index b73b4a1293c3..ea8fb1516028 100644
--- a/sdk/storage/arm-storage/LICENSE.txt
+++ b/sdk/storage/arm-storage/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Microsoft
+Copyright (c) 2020 Microsoft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/sdk/storage/arm-storage/src/models/index.ts b/sdk/storage/arm-storage/src/models/index.ts
index 79a6962f0666..af2b943406ae 100644
--- a/sdk/storage/arm-storage/src/models/index.ts
+++ b/sdk/storage/arm-storage/src/models/index.ts
@@ -270,6 +270,12 @@ export interface EncryptionService {
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
   readonly lastEnabledTime?: Date;
+  /**
+   * Encryption key type to be used for the encryption service. 'Account' key type implies that an
+   * account-scoped encryption key will be used. 'Service' key type implies that a default service
+   * key is used. Possible values include: 'Service', 'Account'
+   */
+  keyType?: KeyType;
 }
 
 /**
@@ -286,14 +292,12 @@ export interface EncryptionServices {
   file?: EncryptionService;
   /**
    * The encryption function of the table storage service.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  readonly table?: EncryptionService;
+  table?: EncryptionService;
   /**
    * The encryption function of the queue storage service.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  readonly queue?: EncryptionService;
+  queue?: EncryptionService;
 }
 
 /**
@@ -1887,7 +1891,7 @@ export interface FileShare extends AzureEntityResource {
   metadata?: { [propertyName: string]: string };
   /**
    * The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to
-   * 5TB (5120). For Large File Shares, the maximum size is 100000.
+   * 5TB (5120). For Large File Shares, the maximum size is 102400.
    */
   shareQuota?: number;
 }
@@ -1907,7 +1911,7 @@ export interface FileShareItem extends AzureEntityResource {
   metadata?: { [propertyName: string]: string };
   /**
    * The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to
-   * 5TB (5120). For Large File Shares, the maximum size is 100000.
+   * 5TB (5120). For Large File Shares, the maximum size is 102400.
    */
   shareQuota?: number;
 }
@@ -2053,7 +2057,7 @@ export interface FileSharesCreateOptionalParams extends msRest.RequestOptionsBas
   metadata?: { [propertyName: string]: string };
   /**
    * The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to
-   * 5TB (5120). For Large File Shares, the maximum size is 100000.
+   * 5TB (5120). For Large File Shares, the maximum size is 102400.
    */
   shareQuota?: number;
 }
@@ -2068,7 +2072,7 @@ export interface FileSharesUpdateOptionalParams extends msRest.RequestOptionsBas
   metadata?: { [propertyName: string]: string };
   /**
    * The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to
-   * 5TB (5120). For Large File Shares, the maximum size is 100000.
+   * 5TB (5120). For Large File Shares, the maximum size is 102400.
    */
   shareQuota?: number;
 }
@@ -2259,6 +2263,14 @@ export type Kind = 'Storage' | 'StorageV2' | 'BlobStorage' | 'FileStorage' | 'Bl
  */
 export type Reason = 'AccountNameInvalid' | 'AlreadyExists';
 
+/**
+ * Defines values for KeyType.
+ * Possible values include: 'Service', 'Account'
+ * @readonly
+ * @enum {string}
+ */
+export type KeyType = 'Service' | 'Account';
+
 /**
  * Defines values for KeySource.
  * Possible values include: 'Microsoft.Storage', 'Microsoft.Keyvault'
diff --git a/sdk/storage/arm-storage/src/models/mappers.ts b/sdk/storage/arm-storage/src/models/mappers.ts
index 149a36cd7e7f..bb98e818705c 100644
--- a/sdk/storage/arm-storage/src/models/mappers.ts
+++ b/sdk/storage/arm-storage/src/models/mappers.ts
@@ -435,6 +435,12 @@ export const EncryptionService: msRest.CompositeMapper = {
         type: {
           name: "DateTime"
         }
+      },
+      keyType: {
+        serializedName: "keyType",
+        type: {
+          name: "String"
+        }
       }
     }
   }
@@ -461,7 +467,6 @@ export const EncryptionServices: msRest.CompositeMapper = {
         }
       },
       table: {
-        readOnly: true,
         serializedName: "table",
         type: {
           name: "Composite",
@@ -469,7 +474,6 @@ export const EncryptionServices: msRest.CompositeMapper = {
         }
       },
       queue: {
-        readOnly: true,
         serializedName: "queue",
         type: {
           name: "Composite",
@@ -3046,7 +3050,7 @@ export const FileShare: msRest.CompositeMapper = {
       shareQuota: {
         serializedName: "properties.shareQuota",
         constraints: {
-          InclusiveMaximum: 100000,
+          InclusiveMaximum: 102400,
           InclusiveMinimum: 1
         },
         type: {
@@ -3085,7 +3089,7 @@ export const FileShareItem: msRest.CompositeMapper = {
       shareQuota: {
         serializedName: "properties.shareQuota",
         constraints: {
-          InclusiveMaximum: 100000,
+          InclusiveMaximum: 102400,
           InclusiveMinimum: 1
         },
         type: {