google-api-client 0.40.0 → 0.41.2

data/generated/google/apis/androidenterprise_v1/representations.rb

@@ -490,12 +490,6 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class UserToken
-        class Representation < Google::Apis::Core::JsonRepresentation; end
-      
-        include Google::Apis::Core::JsonObjectSupport
-      end
-      
       class ListUsersResponse
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
@@ -536,7 +530,6 @@ module Google
       class AdministratorWebToken
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
           property :token, as: 'token'
         end
       end
@@ -544,7 +537,6 @@ module Google
       class AdministratorWebTokenSpec
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
           property :managed_configurations, as: 'managedConfigurations', class: Google::Apis::AndroidenterpriseV1::AdministratorWebTokenSpecManagedConfigurations, decorator: Google::Apis::AndroidenterpriseV1::AdministratorWebTokenSpecManagedConfigurations::Representation
       
           property :parent, as: 'parent'
@@ -670,14 +662,12 @@ module Google
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
           property :approval_url, as: 'approvalUrl'
-          property :kind, as: 'kind'
         end
       end
       
       class AuthenticationToken
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
           property :token, as: 'token'
         end
       end
@@ -705,7 +695,6 @@ module Google
       class ConfigurationVariables
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
           property :mcm_id, as: 'mcmId'
           collection :variable_set, as: 'variableSet', class: Google::Apis::AndroidenterpriseV1::VariableSet, decorator: Google::Apis::AndroidenterpriseV1::VariableSet::Representation
       
@@ -716,7 +705,6 @@ module Google
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
           property :android_id, as: 'androidId'
-          property :kind, as: 'kind'
           property :management_type, as: 'managementType'
           property :policy, as: 'policy', class: Google::Apis::AndroidenterpriseV1::Policy, decorator: Google::Apis::AndroidenterpriseV1::Policy::Representation
       
@@ -748,7 +736,6 @@ module Google
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
           property :account_state, as: 'accountState'
-          property :kind, as: 'kind'
         end
       end
       
@@ -757,7 +744,6 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           collection :device, as: 'device', class: Google::Apis::AndroidenterpriseV1::Device, decorator: Google::Apis::AndroidenterpriseV1::Device::Representation
       
-          property :kind, as: 'kind'
         end
       end
       
@@ -767,7 +753,6 @@ module Google
           collection :administrator, as: 'administrator', class: Google::Apis::AndroidenterpriseV1::Administrator, decorator: Google::Apis::AndroidenterpriseV1::Administrator::Representation
       
           property :id, as: 'id'
-          property :kind, as: 'kind'
           property :name, as: 'name'
           property :primary_domain, as: 'primaryDomain'
         end
@@ -777,7 +762,6 @@ module Google
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
           property :account_email, as: 'accountEmail'
-          property :kind, as: 'kind'
         end
       end
       
@@ -786,7 +770,6 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           collection :enterprise, as: 'enterprise', class: Google::Apis::AndroidenterpriseV1::Enterprise, decorator: Google::Apis::AndroidenterpriseV1::Enterprise::Representation
       
-          property :kind, as: 'kind'
         end
       end
       
@@ -801,7 +784,6 @@ module Google
       class Entitlement
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
           property :product_id, as: 'productId'
           property :reason, as: 'reason'
         end
@@ -812,7 +794,6 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           collection :entitlement, as: 'entitlement', class: Google::Apis::AndroidenterpriseV1::Entitlement, decorator: Google::Apis::AndroidenterpriseV1::Entitlement::Representation
       
-          property :kind, as: 'kind'
         end
       end
       
@@ -821,7 +802,6 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           property :acquisition_kind, as: 'acquisitionKind'
           property :approval, as: 'approval'
-          property :kind, as: 'kind'
           property :num_provisioned, as: 'numProvisioned'
           property :num_purchased, as: 'numPurchased'
           property :permissions, as: 'permissions'
@@ -832,7 +812,6 @@ module Google
       class ListGroupLicenseUsersResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
           collection :user, as: 'user', class: Google::Apis::AndroidenterpriseV1::User, decorator: Google::Apis::AndroidenterpriseV1::User::Representation
       
         end
@@ -843,7 +822,6 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           collection :group_license, as: 'groupLicense', class: Google::Apis::AndroidenterpriseV1::GroupLicense, decorator: Google::Apis::AndroidenterpriseV1::GroupLicense::Representation
       
-          property :kind, as: 'kind'
         end
       end
       
@@ -851,7 +829,6 @@ module Google
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
           property :install_state, as: 'installState'
-          property :kind, as: 'kind'
           property :product_id, as: 'productId'
           property :version_code, as: 'versionCode'
         end
@@ -873,7 +850,6 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           collection :install, as: 'install', class: Google::Apis::AndroidenterpriseV1::Install, decorator: Google::Apis::AndroidenterpriseV1::Install::Representation
       
-          property :kind, as: 'kind'
         end
       end
       
@@ -919,7 +895,6 @@ module Google
       class ManagedConfigurationsForDeviceListResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
           collection :managed_configuration_for_device, as: 'managedConfigurationForDevice', class: Google::Apis::AndroidenterpriseV1::ManagedConfiguration, decorator: Google::Apis::AndroidenterpriseV1::ManagedConfiguration::Representation
       
         end
@@ -928,7 +903,6 @@ module Google
       class ManagedConfigurationsForUserListResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
           collection :managed_configuration_for_user, as: 'managedConfigurationForUser', class: Google::Apis::AndroidenterpriseV1::ManagedConfiguration, decorator: Google::Apis::AndroidenterpriseV1::ManagedConfiguration::Representation
       
         end
@@ -937,7 +911,6 @@ module Google
       class ManagedConfigurationsSettings
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
           property :last_updated_timestamp_millis, :numeric_string => true, as: 'lastUpdatedTimestampMillis'
           property :mcm_id, as: 'mcmId'
           property :name, as: 'name'
@@ -947,7 +920,6 @@ module Google
       class ManagedConfigurationsSettingsListResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
           collection :managed_configurations_settings, as: 'managedConfigurationsSettings', class: Google::Apis::AndroidenterpriseV1::ManagedConfigurationsSettings, decorator: Google::Apis::AndroidenterpriseV1::ManagedConfigurationsSettings::Representation
       
         end
@@ -1023,7 +995,6 @@ module Google
       class NotificationSet
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
           collection :notification, as: 'notification', class: Google::Apis::AndroidenterpriseV1::Notification, decorator: Google::Apis::AndroidenterpriseV1::Notification::Representation
       
           property :notification_set_id, as: 'notificationSetId'
@@ -1043,7 +1014,6 @@ module Google
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
           property :description, as: 'description'
-          property :kind, as: 'kind'
           property :name, as: 'name'
           property :permission_id, as: 'permissionId'
         end
@@ -1079,7 +1049,6 @@ module Google
           property :distribution_channel, as: 'distributionChannel'
           collection :features, as: 'features'
           property :icon_url, as: 'iconUrl'
-          property :kind, as: 'kind'
           property :last_updated_timestamp_millis, :numeric_string => true, as: 'lastUpdatedTimestampMillis'
           property :min_android_sdk_version, as: 'minAndroidSdkVersion'
           collection :permissions, as: 'permissions', class: Google::Apis::AndroidenterpriseV1::ProductPermission, decorator: Google::Apis::AndroidenterpriseV1::ProductPermission::Representation
@@ -1124,7 +1093,6 @@ module Google
       class ProductPermissions
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
           collection :permission, as: 'permission', class: Google::Apis::AndroidenterpriseV1::ProductPermission, decorator: Google::Apis::AndroidenterpriseV1::ProductPermission::Representation
       
           property :product_id, as: 'productId'
@@ -1147,7 +1115,6 @@ module Google
       class ProductSet
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
           collection :product_id, as: 'productId'
           property :product_set_behavior, as: 'productSetBehavior'
           collection :product_visibility, as: 'productVisibility', class: Google::Apis::AndroidenterpriseV1::ProductVisibility, decorator: Google::Apis::AndroidenterpriseV1::ProductVisibility::Representation
@@ -1191,7 +1158,6 @@ module Google
       class ProductsListResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
           property :page_info, as: 'pageInfo', class: Google::Apis::AndroidenterpriseV1::PageInfo, decorator: Google::Apis::AndroidenterpriseV1::PageInfo::Representation
       
           collection :product, as: 'product', class: Google::Apis::AndroidenterpriseV1::Product, decorator: Google::Apis::AndroidenterpriseV1::Product::Representation
@@ -1206,7 +1172,6 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           property :key, as: 'key', class: Google::Apis::AndroidenterpriseV1::ServiceAccountKey, decorator: Google::Apis::AndroidenterpriseV1::ServiceAccountKey::Representation
       
-          property :kind, as: 'kind'
           property :name, as: 'name'
         end
       end
@@ -1216,7 +1181,6 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           property :data, as: 'data'
           property :id, as: 'id'
-          property :kind, as: 'kind'
           property :public_data, as: 'publicData'
           property :type, as: 'type'
         end
@@ -1243,7 +1207,6 @@ module Google
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
           property :id, as: 'id'
-          property :kind, as: 'kind'
           collection :name, as: 'name', class: Google::Apis::AndroidenterpriseV1::LocalizedText, decorator: Google::Apis::AndroidenterpriseV1::LocalizedText::Representation
       
           property :order_in_page, as: 'orderInPage'
@@ -1255,7 +1218,6 @@ module Google
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
           property :homepage_id, as: 'homepageId'
-          property :kind, as: 'kind'
           property :store_layout_type, as: 'storeLayoutType'
         end
       end
@@ -1265,14 +1227,12 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           collection :cluster, as: 'cluster', class: Google::Apis::AndroidenterpriseV1::StoreCluster, decorator: Google::Apis::AndroidenterpriseV1::StoreCluster::Representation
       
-          property :kind, as: 'kind'
         end
       end
       
       class StoreLayoutPagesListResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
           collection :page, as: 'page', class: Google::Apis::AndroidenterpriseV1::StorePage, decorator: Google::Apis::AndroidenterpriseV1::StorePage::Representation
       
         end
@@ -1282,7 +1242,6 @@ module Google
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
           property :id, as: 'id'
-          property :kind, as: 'kind'
           collection :link, as: 'link'
           collection :name, as: 'name', class: Google::Apis::AndroidenterpriseV1::LocalizedText, decorator: Google::Apis::AndroidenterpriseV1::LocalizedText::Representation
       
@@ -1312,25 +1271,14 @@ module Google
           property :account_type, as: 'accountType'
           property :display_name, as: 'displayName'
           property :id, as: 'id'
-          property :kind, as: 'kind'
           property :management_type, as: 'managementType'
           property :primary_email, as: 'primaryEmail'
         end
       end
       
-      class UserToken
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
-          property :token, as: 'token'
-          property :user_id, as: 'userId'
-        end
-      end
-      
       class ListUsersResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
           collection :user, as: 'user', class: Google::Apis::AndroidenterpriseV1::User, decorator: Google::Apis::AndroidenterpriseV1::User::Representation
       
         end
@@ -1339,7 +1287,6 @@ module Google
       class VariableSet
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
           property :placeholder, as: 'placeholder'
           property :user_value, as: 'userValue'
         end
@@ -1369,7 +1316,6 @@ module Google
       class WebAppsListResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :kind, as: 'kind'
           collection :web_app, as: 'webApp', class: Google::Apis::AndroidenterpriseV1::WebApp, decorator: Google::Apis::AndroidenterpriseV1::WebApp::Representation
       
         end

data/generated/google/apis/androidenterprise_v1/service.rb

@@ -22,7 +22,7 @@ module Google
     module AndroidenterpriseV1
       # Google Play EMM API
       #
-      # Manages the deployment of apps to Android for Work users.
+      # Manages the deployment of apps to Android Enterprise devices.
       #
       # @example
       #    require 'google/apis/androidenterprise_v1'
@@ -38,22 +38,20 @@ module Google
         attr_accessor :key
 
         # @return [String]
-        #  An opaque string that represents a user for quota purposes. Must not exceed 40
-        #  characters.
+        #  Available to use for quota purposes for server-side applications. Can be any
+        #  arbitrary string assigned to a user, but should not exceed 40 characters.
         attr_accessor :quota_user
 
-        # @return [String]
-        #  Deprecated. Please use quotaUser instead.
-        attr_accessor :user_ip
-
         def initialize
-          super('https://www.googleapis.com/', 'androidenterprise/v1/')
+          super('https://www.googleapis.com/', '')
           @batch_path = 'batch/androidenterprise/v1'
         end
         
-        # Uploads a report containing any changes in app states on the device since the
-        # last report was generated. You can call this method up to 3 times every 24
-        # hours for a given device.
+        # Uploads a report containing any changes in app states on the device since
+        # the last report was generated. You can call this method up to 3 times every
+        # 24 hours for a given device.
+        # If you exceed the quota, then the Google Play EMM API returns <code>HTTP
+        # 429 Too Many Requests</code>.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] user_id
@@ -63,10 +61,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -79,14 +75,13 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def force_device_report_upload(enterprise_id, user_id, device_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/forceReportUpload', options)
+        def force_device_report_upload(enterprise_id, user_id, device_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/forceReportUpload', options)
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['userId'] = user_id unless user_id.nil?
           command.params['deviceId'] = device_id unless device_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -100,10 +95,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -116,8 +109,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_device(enterprise_id, user_id, device_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}', options)
+        def get_device(enterprise_id, user_id, device_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::Device::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::Device
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
@@ -125,15 +118,16 @@ module Google
           command.params['deviceId'] = device_id unless device_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieves whether a device's access to Google services is enabled or disabled.
+        # Retrieves whether a device's access to Google services is enabled or
+        # disabled.
         # The device state takes effect only if enforcing EMM policies on Android
-        # devices is enabled in the Google Admin Console. Otherwise, the device state is
-        # ignored and all devices are allowed access to Google services. This is only
-        # supported for Google-managed users.
+        # devices is enabled in the Google Admin Console.
+        # Otherwise, the device state is ignored and all devices are allowed access
+        # to Google services.
+        # This is only supported for Google-managed users.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] user_id
@@ -143,10 +137,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -159,8 +151,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_device_state(enterprise_id, user_id, device_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/state', options)
+        def get_device_state(enterprise_id, user_id, device_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/state', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::DeviceState::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::DeviceState
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
@@ -168,7 +160,6 @@ module Google
           command.params['deviceId'] = device_id unless device_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -180,10 +171,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -196,23 +185,23 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_devices(enterprise_id, user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/users/{userId}/devices', options)
+        def list_devices(enterprise_id, user_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/devices', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::ListDevicesResponse::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::ListDevicesResponse
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Sets whether a device's access to Google services is enabled or disabled. The
-        # device state takes effect only if enforcing EMM policies on Android devices is
-        # enabled in the Google Admin Console. Otherwise, the device state is ignored
-        # and all devices are allowed access to Google services. This is only supported
-        # for Google-managed users.
+        # Sets whether a device's access to Google services is enabled or disabled.
+        # The device state takes effect only if enforcing EMM policies on Android
+        # devices is enabled in the Google Admin Console.
+        # Otherwise, the device state is ignored and all devices are allowed access
+        # to Google services.
+        # This is only supported for Google-managed users.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] user_id
@@ -223,10 +212,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -239,8 +226,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def set_device_state(enterprise_id, user_id, device_id, device_state_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:put, 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/state', options)
+        def set_device_state(enterprise_id, user_id, device_id, device_state_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:put, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/state', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::DeviceState::Representation
           command.request_object = device_state_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::DeviceState::Representation
@@ -250,7 +237,6 @@ module Google
           command.params['deviceId'] = device_id unless device_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -263,17 +249,15 @@ module Google
         #   The ID of the device.
         # @param [Google::Apis::AndroidenterpriseV1::Device] device_object
         # @param [String] update_mask
-        #   Mask that identifies which fields to update. If not set, all modifiable fields
-        #   will be modified.
-        #   When set in a query parameter, this field should be specified as updateMask=<
-        #   field1>,<field2>,...
+        #   Mask that identifies which fields to update. If not set, all modifiable
+        #   fields will be modified.
+        #   When set in a query parameter, this field should be specified as
+        #   <code>updateMask=&lt;field1&gt;,&lt;field2&gt;,...</code>
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -286,8 +270,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_device(enterprise_id, user_id, device_id, device_object = nil, update_mask: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:put, 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}', options)
+        def update_device(enterprise_id, user_id, device_id, device_object = nil, update_mask: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:put, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::Device::Representation
           command.request_object = device_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::Device::Representation
@@ -298,23 +282,20 @@ module Google
           command.query['updateMask'] = update_mask unless update_mask.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Acknowledges notifications that were received from Enterprises.
-        # PullNotificationSet to prevent subsequent calls from returning the same
-        # notifications.
+        # Acknowledges notifications that were received from
+        # Enterprises.PullNotificationSet to prevent subsequent calls from returning
+        # the same notifications.
         # @param [String] notification_set_id
-        #   The notification set ID as returned by Enterprises.PullNotificationSet. This
-        #   must be provided.
+        #   The notification set ID as returned by Enterprises.PullNotificationSet.
+        #   This must be provided.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -327,17 +308,17 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def acknowledge_enterprise_notification_set(notification_set_id: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/acknowledgeNotificationSet', options)
+        def acknowledge_enterprise_notification_set(notification_set_id: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'androidenterprise/v1/enterprises/acknowledgeNotificationSet', options)
           command.query['notificationSetId'] = notification_set_id unless notification_set_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Completes the signup flow, by specifying the Completion token and Enterprise
-        # token. This request must not be called multiple times for a given Enterprise
+        # Completes the signup flow, by specifying the Completion token and
+        # Enterprise token.
+        # This request must not be called multiple times for a given Enterprise
         # Token.
         # @param [String] completion_token
         #   The Completion token initially returned by GenerateSignupUrl.
@@ -346,10 +327,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -362,32 +341,29 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def complete_enterprise_signup(completion_token: nil, enterprise_token: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/completeSignup', options)
+        def complete_enterprise_signup(completion_token: nil, enterprise_token: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'androidenterprise/v1/enterprises/completeSignup', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::Enterprise::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::Enterprise
           command.query['completionToken'] = completion_token unless completion_token.nil?
           command.query['enterpriseToken'] = enterprise_token unless enterprise_token.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Returns a unique token to access an embeddable UI. To generate a web UI, pass
-        # the generated token into the managed Google Play javascript API. Each token
-        # may only be used to start one UI session. See the javascript API documentation
-        # for further information.
+        # Returns a unique token to access an embeddable UI. To generate a
+        # web UI, pass the generated token into the managed Google Play javascript
+        # API. Each token may only be used to start one UI session. See the
+        # javascript API documentation for further information.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [Google::Apis::AndroidenterpriseV1::AdministratorWebTokenSpec] administrator_web_token_spec_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -400,8 +376,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def create_enterprise_web_token(enterprise_id, administrator_web_token_spec_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/{enterpriseId}/createWebToken', options)
+        def create_enterprise_web_token(enterprise_id, administrator_web_token_spec_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'androidenterprise/v1/enterprises/{enterpriseId}/createWebToken', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::AdministratorWebTokenSpec::Representation
           command.request_object = administrator_web_token_spec_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::AdministratorWebToken::Representation
@@ -409,21 +385,18 @@ module Google
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Enrolls an enterprise with the calling EMM.
         # @param [String] token
-        #   The token provided by the enterprise to register the EMM.
+        #   Required. The token provided by the enterprise to register the EMM.
         # @param [Google::Apis::AndroidenterpriseV1::Enterprise] enterprise_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -436,8 +409,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def enroll_enterprise(token, enterprise_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/enroll', options)
+        def enroll_enterprise(token, enterprise_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'androidenterprise/v1/enterprises/enroll', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::Enterprise::Representation
           command.request_object = enterprise_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::Enterprise::Representation
@@ -445,26 +418,24 @@ module Google
           command.query['token'] = token unless token.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Generates a sign-up URL.
         # @param [String] callback_url
         #   The callback URL to which the Admin will be redirected after successfully
-        #   creating an enterprise. Before redirecting there the system will add a single
-        #   query parameter to this URL named "enterpriseToken" which will contain an
-        #   opaque token to be used for the CompleteSignup request.
-        #   Beware that this means that the URL will be parsed, the parameter added and
-        #   then a new URL formatted, i.e. there may be some minor formatting changes and,
-        #   more importantly, the URL must be well-formed so that it can be parsed.
+        #   creating an enterprise. Before redirecting there the system will add a
+        #   single query parameter to this URL named "enterpriseToken" which will
+        #   contain an opaque token to be used for the CompleteSignup request.<br>
+        #   Beware that this means that the URL will be parsed, the parameter added
+        #   and then a new URL formatted, i.e. there may be some minor formatting
+        #   changes and, more importantly, the URL must be well-formed so that it can
+        #   be parsed.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -477,14 +448,13 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def generate_enterprise_signup_url(callback_url: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/signupUrl', options)
+        def generate_enterprise_signup_url(callback_url: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'androidenterprise/v1/enterprises/signupUrl', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::SignupInfo::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::SignupInfo
           command.query['callbackUrl'] = callback_url unless callback_url.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -494,10 +464,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -510,28 +478,31 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_enterprise(enterprise_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}', options)
+        def get_enterprise(enterprise_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::Enterprise::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::Enterprise
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Returns a service account and credentials. The service account can be bound to
-        # the enterprise by calling setAccount. The service account is unique to this
-        # enterprise and EMM, and will be deleted if the enterprise is unbound. The
-        # credentials contain private key data and are not stored server-side.
-        # This method can only be called after calling Enterprises.Enroll or Enterprises.
-        # CompleteSignup, and before Enterprises.SetAccount; at other times it will
-        # return an error.
+        # Returns a service account and credentials. The service account
+        # can be bound to the enterprise by calling setAccount. The service account
+        # is unique to this enterprise and EMM, and will be deleted if the enterprise
+        # is unbound. The credentials contain private key data and are not stored
+        # server-side.
+        # <br> <br>
+        # This method can only be called after calling
+        # Enterprises.Enroll or Enterprises.CompleteSignup, and before
+        # Enterprises.SetAccount; at other times it will return an error.
+        # <br> <br>
         # Subsequent calls after the first will generate a new, unique set of
         # credentials, and invalidate the previously generated credentials.
-        # Once the service account is bound to the enterprise, it can be managed using
-        # the serviceAccountKeys resource.
+        # <br> <br>
+        # Once the service account is bound to the enterprise, it can be managed
+        # using the serviceAccountKeys resource.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] key_type
@@ -539,10 +510,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -555,29 +524,27 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_enterprise_service_account(enterprise_id, key_type: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/serviceAccount', options)
+        def get_enterprise_service_account(enterprise_id, key_type: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/serviceAccount', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::ServiceAccount::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::ServiceAccount
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.query['keyType'] = key_type unless key_type.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Returns the store layout for the enterprise. If the store layout has not been
-        # set, returns "basic" as the store layout type and no homepage.
+        # Returns the store layout for the enterprise. If the store layout
+        # has not been set, returns "basic" as the store layout type and no
+        # homepage.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -590,31 +557,28 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_enterprise_store_layout(enterprise_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/storeLayout', options)
+        def get_enterprise_store_layout(enterprise_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/storeLayout', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::StoreLayout::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::StoreLayout
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Looks up an enterprise by domain name. This is only supported for enterprises
-        # created via the Google-initiated creation flow. Lookup of the id is not needed
-        # for enterprises created via the EMM-initiated flow since the EMM learns the
-        # enterprise ID in the callback specified in the Enterprises.generateSignupUrl
-        # call.
+        # Looks up an enterprise by domain name.
+        # This is only supported for enterprises created via the Google-initiated
+        # creation flow.  Lookup of the id is not needed for enterprises created via
+        # the EMM-initiated flow since the EMM learns the enterprise ID in the
+        # callback specified in the Enterprises.generateSignupUrl call.
         # @param [String] domain
-        #   The exact primary domain name of the enterprise to look up.
+        #   Required. The exact primary domain name of the enterprise to look up.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -627,47 +591,53 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_enterprises(domain, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises', options)
+        def list_enterprises(domain, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::ListEnterprisesResponse::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::ListEnterprisesResponse
           command.query['domain'] = domain unless domain.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Pulls and returns a notification set for the enterprises associated with the
-        # service account authenticated for the request. The notification set may be
-        # empty if no notification are pending.
-        # A notification set returned needs to be acknowledged within 20 seconds by
-        # calling Enterprises.AcknowledgeNotificationSet, unless the notification set is
-        # empty.
-        # Notifications that are not acknowledged within the 20 seconds will eventually
-        # be included again in the response to another PullNotificationSet request, and
-        # those that are never acknowledged will ultimately be deleted according to the
-        # Google Cloud Platform Pub/Sub system policy.
-        # Multiple requests might be performed concurrently to retrieve notifications,
-        # in which case the pending notifications (if any) will be split among each
-        # caller, if any are pending.
+        # Pulls and returns a notification set for the enterprises associated with
+        # the service account authenticated for the request. The notification set may
+        # be empty if no notification are pending.
+        # <br>
+        # A notification set returned needs to be acknowledged within 20 seconds
+        # by calling Enterprises.AcknowledgeNotificationSet, unless the
+        # notification set is empty.
+        # <br>
+        # Notifications that are not acknowledged within the 20 seconds will
+        # eventually be included again in the response to another PullNotificationSet
+        # request, and those that are never acknowledged will ultimately be deleted
+        # according to the Google Cloud Platform Pub/Sub system policy.
+        # <br>
+        # Multiple requests might be performed concurrently to retrieve
+        # notifications, in which case the pending notifications (if any) will be
+        # split among each caller, if any are pending.
+        # <br>
         # If no notifications are present, an empty notification list is returned.
-        # Subsequent requests may return more notifications once they become available.
+        # Subsequent requests may return more notifications once they become
+        # available.
         # @param [String] request_mode
         #   The request mode for pulling notifications.
-        #   Specifying waitForNotifications will cause the request to block and wait until
-        #   one or more notifications are present, or return an empty notification list if
-        #   no notifications are present after some time.
-        #   Speciying returnImmediately will cause the request to immediately return the
-        #   pending notifications, or an empty list if no notifications are present.
-        #   If omitted, defaults to waitForNotifications.
+        #   <br>
+        #   Specifying <code>waitForNotifications</code> will cause the request to
+        #   block and wait until one or more notifications are present, or return an
+        #   empty notification list if no notifications are present after some time.
+        #   <br>
+        #   Speciying <code>returnImmediately</code> will cause the request to
+        #   immediately return the pending notifications, or an empty list if no
+        #   notifications are present.
+        #   <br>
+        #   If omitted, defaults to <code>waitForNotifications</code>.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -680,28 +650,25 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def pull_enterprise_notification_set(request_mode: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/pullNotificationSet', options)
+        def pull_enterprise_notification_set(request_mode: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'androidenterprise/v1/enterprises/pullNotificationSet', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::NotificationSet::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::NotificationSet
           command.query['requestMode'] = request_mode unless request_mode.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Sends a test notification to validate the EMM integration with the Google
-        # Cloud Pub/Sub service for this enterprise.
+        # Sends a test notification to validate the EMM integration with
+        # the Google Cloud Pub/Sub service for this enterprise.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -714,14 +681,13 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def send_enterprise_test_push_notification(enterprise_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/{enterpriseId}/sendTestPushNotification', options)
+        def send_enterprise_test_push_notification(enterprise_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'androidenterprise/v1/enterprises/{enterpriseId}/sendTestPushNotification', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::SendTestPushNotificationResponse::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::SendTestPushNotificationResponse
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -733,10 +699,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -749,8 +713,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def set_enterprise_account(enterprise_id, enterprise_account_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:put, 'enterprises/{enterpriseId}/account', options)
+        def set_enterprise_account(enterprise_id, enterprise_account_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:put, 'androidenterprise/v1/enterprises/{enterpriseId}/account', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::EnterpriseAccount::Representation
           command.request_object = enterprise_account_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::EnterpriseAccount::Representation
@@ -758,27 +722,26 @@ module Google
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Sets the store layout for the enterprise. By default, storeLayoutType is set
-        # to "basic" and the basic store layout is enabled. The basic layout only
-        # contains apps approved by the admin, and that have been added to the available
-        # product set for a user (using the  setAvailableProductSet call). Apps on the
-        # page are sorted in order of their product ID value. If you create a custom
-        # store layout (by setting storeLayoutType = "custom" and setting a homepage),
-        # the basic store layout is disabled.
+        # Sets the store layout for the enterprise. By default, storeLayoutType
+        # is set to "basic" and the basic store layout is enabled. The basic
+        # layout only contains apps approved by the admin, and that have
+        # been added to the available product set for a user (using the
+        # <a href="/android/work/play/emm-api/v1/users/setAvailableProductSet">
+        # setAvailableProductSet</a> call). Apps on the page are sorted in order of
+        # their product ID value. If you create a custom store layout (by setting
+        # storeLayoutType = "custom" and setting a homepage), the basic store
+        # layout is disabled.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [Google::Apis::AndroidenterpriseV1::StoreLayout] store_layout_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -791,8 +754,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def set_enterprise_store_layout(enterprise_id, store_layout_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:put, 'enterprises/{enterpriseId}/storeLayout', options)
+        def set_enterprise_store_layout(enterprise_id, store_layout_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:put, 'androidenterprise/v1/enterprises/{enterpriseId}/storeLayout', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::StoreLayout::Representation
           command.request_object = store_layout_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::StoreLayout::Representation
@@ -800,7 +763,6 @@ module Google
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -810,10 +772,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -826,12 +786,11 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def unenroll_enterprise(enterprise_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/{enterpriseId}/unenroll', options)
+        def unenroll_enterprise(enterprise_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'androidenterprise/v1/enterprises/{enterpriseId}/unenroll', options)
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -845,10 +804,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -861,14 +818,13 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_entitlement(enterprise_id, user_id, entitlement_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'enterprises/{enterpriseId}/users/{userId}/entitlements/{entitlementId}', options)
+        def delete_entitlement(enterprise_id, user_id, entitlement_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:delete, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/entitlements/{entitlementId}', options)
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['userId'] = user_id unless user_id.nil?
           command.params['entitlementId'] = entitlement_id unless entitlement_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -882,10 +838,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -898,8 +852,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_entitlement(enterprise_id, user_id, entitlement_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/users/{userId}/entitlements/{entitlementId}', options)
+        def get_entitlement(enterprise_id, user_id, entitlement_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/entitlements/{entitlementId}', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::Entitlement::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::Entitlement
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
@@ -907,7 +861,6 @@ module Google
           command.params['entitlementId'] = entitlement_id unless entitlement_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -919,10 +872,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -935,15 +886,14 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_entitlements(enterprise_id, user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/users/{userId}/entitlements', options)
+        def list_entitlements(enterprise_id, user_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/entitlements', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::ListEntitlementsResponse::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::ListEntitlementsResponse
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -957,16 +907,14 @@ module Google
         # @param [Google::Apis::AndroidenterpriseV1::Entitlement] entitlement_object
         # @param [Boolean] install
         #   Set to true to also install the product on all the user's devices where
-        #   possible. Failure to install on one or more devices will not prevent this
-        #   operation from returning successfully, as long as the entitlement was
-        #   successfully assigned to the user.
+        #   possible. Failure to install on one or more devices will not prevent
+        #   this operation from returning successfully, as long as the entitlement
+        #   was successfully assigned to the user.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -979,8 +927,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_entitlement(enterprise_id, user_id, entitlement_id, entitlement_object = nil, install: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:put, 'enterprises/{enterpriseId}/users/{userId}/entitlements/{entitlementId}', options)
+        def update_entitlement(enterprise_id, user_id, entitlement_id, entitlement_object = nil, install: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:put, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/entitlements/{entitlementId}', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::Entitlement::Representation
           command.request_object = entitlement_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::Entitlement::Representation
@@ -991,7 +939,6 @@ module Google
           command.query['install'] = install unless install.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -999,15 +946,13 @@ module Google
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] group_license_id
-        #   The ID of the product the group license is for, e.g. "app:com.google.android.
-        #   gm".
+        #   The ID of the product the group license is for, e.g.
+        #   "app:com.google.android.gm".
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1020,15 +965,14 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_group_license(enterprise_id, group_license_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/groupLicenses/{groupLicenseId}', options)
+        def get_group_license(enterprise_id, group_license_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/groupLicenses/{groupLicenseId}', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::GroupLicense::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::GroupLicense
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['groupLicenseId'] = group_license_id unless group_license_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1038,10 +982,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1054,31 +996,28 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_group_licenses(enterprise_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/groupLicenses', options)
+        def list_group_licenses(enterprise_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/groupLicenses', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::ListGroupLicensesResponse::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::ListGroupLicensesResponse
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieves the IDs of the users who have been granted entitlements under the
-        # license.
+        # Retrieves the IDs of the users who have been granted entitlements
+        # under the license.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] group_license_id
-        #   The ID of the product the group license is for, e.g. "app:com.google.android.
-        #   gm".
+        #   The ID of the product the group license is for, e.g.
+        #   "app:com.google.android.gm".
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1091,20 +1030,20 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_group_license_users(enterprise_id, group_license_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/groupLicenses/{groupLicenseId}/users', options)
+        def list_group_license_users(enterprise_id, group_license_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/groupLicenses/{groupLicenseId}/users', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::ListGroupLicenseUsersResponse::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::ListGroupLicenseUsersResponse
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['groupLicenseId'] = group_license_id unless group_license_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Requests to remove an app from a device. A call to get or list will still show
-        # the app as installed on the device until it is actually removed.
+        # Requests to remove an app from a device. A call to <code>get</code> or
+        # <code>list</code> will still show the app as installed on the device until
+        # it is actually removed.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] user_id
@@ -1112,15 +1051,13 @@ module Google
         # @param [String] device_id
         #   The Android ID of the device.
         # @param [String] install_id
-        #   The ID of the product represented by the install, e.g. "app:com.google.android.
-        #   gm".
+        #   The ID of the product represented by the install, e.g.
+        #   "app:com.google.android.gm".
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1133,15 +1070,14 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_install(enterprise_id, user_id, device_id, install_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/installs/{installId}', options)
+        def delete_install(enterprise_id, user_id, device_id, install_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:delete, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/installs/{installId}', options)
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['userId'] = user_id unless user_id.nil?
           command.params['deviceId'] = device_id unless device_id.nil?
           command.params['installId'] = install_id unless install_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1153,15 +1089,13 @@ module Google
         # @param [String] device_id
         #   The Android ID of the device.
         # @param [String] install_id
-        #   The ID of the product represented by the install, e.g. "app:com.google.android.
-        #   gm".
+        #   The ID of the product represented by the install, e.g.
+        #   "app:com.google.android.gm".
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1174,8 +1108,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_install(enterprise_id, user_id, device_id, install_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/installs/{installId}', options)
+        def get_install(enterprise_id, user_id, device_id, install_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/installs/{installId}', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::Install::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::Install
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
@@ -1184,7 +1118,6 @@ module Google
           command.params['installId'] = install_id unless install_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1198,10 +1131,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1214,8 +1145,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_installs(enterprise_id, user_id, device_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/installs', options)
+        def list_installs(enterprise_id, user_id, device_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/installs', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::ListInstallsResponse::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::ListInstallsResponse
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
@@ -1223,12 +1154,12 @@ module Google
           command.params['deviceId'] = device_id unless device_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Requests to install the latest version of an app to a device. If the app is
-        # already installed, then it is updated to the latest version if necessary.
+        # Requests to install the latest version of an app to a device. If the app
+        # is already installed, then it is updated to the latest version if
+        # necessary.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] user_id
@@ -1236,16 +1167,14 @@ module Google
         # @param [String] device_id
         #   The Android ID of the device.
         # @param [String] install_id
-        #   The ID of the product represented by the install, e.g. "app:com.google.android.
-        #   gm".
+        #   The ID of the product represented by the install, e.g.
+        #   "app:com.google.android.gm".
         # @param [Google::Apis::AndroidenterpriseV1::Install] install_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1258,8 +1187,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_install(enterprise_id, user_id, device_id, install_id, install_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:put, 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/installs/{installId}', options)
+        def update_install(enterprise_id, user_id, device_id, install_id, install_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:put, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/installs/{installId}', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::Install::Representation
           command.request_object = install_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::Install::Representation
@@ -1270,11 +1199,11 @@ module Google
           command.params['installId'] = install_id unless install_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Removes a per-device managed configuration for an app for the specified device.
+        # Removes a per-device managed configuration for an app for the specified
+        # device.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] user_id
@@ -1282,15 +1211,13 @@ module Google
         # @param [String] device_id
         #   The Android ID of the device.
         # @param [String] managed_configuration_for_device_id
-        #   The ID of the managed configuration (a product ID), e.g. "app:com.google.
-        #   android.gm".
+        #   The ID of the managed configuration (a product ID), e.g.
+        #   "app:com.google.android.gm".
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1303,15 +1230,14 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_managedconfigurationsfordevice(enterprise_id, user_id, device_id, managed_configuration_for_device_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/managedConfigurationsForDevice/{managedConfigurationForDeviceId}', options)
+        def delete_managedconfigurationsfordevice(enterprise_id, user_id, device_id, managed_configuration_for_device_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:delete, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/managedConfigurationsForDevice/{managedConfigurationForDeviceId}', options)
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['userId'] = user_id unless user_id.nil?
           command.params['deviceId'] = device_id unless device_id.nil?
           command.params['managedConfigurationForDeviceId'] = managed_configuration_for_device_id unless managed_configuration_for_device_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1323,15 +1249,13 @@ module Google
         # @param [String] device_id
         #   The Android ID of the device.
         # @param [String] managed_configuration_for_device_id
-        #   The ID of the managed configuration (a product ID), e.g. "app:com.google.
-        #   android.gm".
+        #   The ID of the managed configuration (a product ID), e.g.
+        #   "app:com.google.android.gm".
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1344,8 +1268,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_managedconfigurationsfordevice(enterprise_id, user_id, device_id, managed_configuration_for_device_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/managedConfigurationsForDevice/{managedConfigurationForDeviceId}', options)
+        def get_managedconfigurationsfordevice(enterprise_id, user_id, device_id, managed_configuration_for_device_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/managedConfigurationsForDevice/{managedConfigurationForDeviceId}', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::ManagedConfiguration::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::ManagedConfiguration
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
@@ -1354,12 +1278,11 @@ module Google
           command.params['managedConfigurationForDeviceId'] = managed_configuration_for_device_id unless managed_configuration_for_device_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Lists all the per-device managed configurations for the specified device. Only
-        # the ID is set.
+        # Lists all the per-device managed configurations for the specified device.
+        # Only the ID is set.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] user_id
@@ -1369,10 +1292,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1385,8 +1306,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_managedconfigurationsfordevices(enterprise_id, user_id, device_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/managedConfigurationsForDevice', options)
+        def list_managedconfigurationsfordevices(enterprise_id, user_id, device_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/managedConfigurationsForDevice', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::ManagedConfigurationsForDeviceListResponse::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::ManagedConfigurationsForDeviceListResponse
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
@@ -1394,7 +1315,6 @@ module Google
           command.params['deviceId'] = device_id unless device_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1407,16 +1327,14 @@ module Google
         # @param [String] device_id
         #   The Android ID of the device.
         # @param [String] managed_configuration_for_device_id
-        #   The ID of the managed configuration (a product ID), e.g. "app:com.google.
-        #   android.gm".
+        #   The ID of the managed configuration (a product ID), e.g.
+        #   "app:com.google.android.gm".
         # @param [Google::Apis::AndroidenterpriseV1::ManagedConfiguration] managed_configuration_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1429,8 +1347,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_managedconfigurationsfordevice(enterprise_id, user_id, device_id, managed_configuration_for_device_id, managed_configuration_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:put, 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/managedConfigurationsForDevice/{managedConfigurationForDeviceId}', options)
+        def update_managedconfigurationsfordevice(enterprise_id, user_id, device_id, managed_configuration_for_device_id, managed_configuration_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:put, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/managedConfigurationsForDevice/{managedConfigurationForDeviceId}', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::ManagedConfiguration::Representation
           command.request_object = managed_configuration_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::ManagedConfiguration::Representation
@@ -1441,7 +1359,6 @@ module Google
           command.params['managedConfigurationForDeviceId'] = managed_configuration_for_device_id unless managed_configuration_for_device_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1451,15 +1368,13 @@ module Google
         # @param [String] user_id
         #   The ID of the user.
         # @param [String] managed_configuration_for_user_id
-        #   The ID of the managed configuration (a product ID), e.g. "app:com.google.
-        #   android.gm".
+        #   The ID of the managed configuration (a product ID), e.g.
+        #   "app:com.google.android.gm".
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1472,14 +1387,13 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_managedconfigurationsforuser(enterprise_id, user_id, managed_configuration_for_user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'enterprises/{enterpriseId}/users/{userId}/managedConfigurationsForUser/{managedConfigurationForUserId}', options)
+        def delete_managedconfigurationsforuser(enterprise_id, user_id, managed_configuration_for_user_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:delete, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/managedConfigurationsForUser/{managedConfigurationForUserId}', options)
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['userId'] = user_id unless user_id.nil?
           command.params['managedConfigurationForUserId'] = managed_configuration_for_user_id unless managed_configuration_for_user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1490,15 +1404,13 @@ module Google
         # @param [String] user_id
         #   The ID of the user.
         # @param [String] managed_configuration_for_user_id
-        #   The ID of the managed configuration (a product ID), e.g. "app:com.google.
-        #   android.gm".
+        #   The ID of the managed configuration (a product ID), e.g.
+        #   "app:com.google.android.gm".
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1511,8 +1423,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_managedconfigurationsforuser(enterprise_id, user_id, managed_configuration_for_user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/users/{userId}/managedConfigurationsForUser/{managedConfigurationForUserId}', options)
+        def get_managedconfigurationsforuser(enterprise_id, user_id, managed_configuration_for_user_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/managedConfigurationsForUser/{managedConfigurationForUserId}', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::ManagedConfiguration::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::ManagedConfiguration
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
@@ -1520,12 +1432,11 @@ module Google
           command.params['managedConfigurationForUserId'] = managed_configuration_for_user_id unless managed_configuration_for_user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Lists all the per-user managed configurations for the specified user. Only the
-        # ID is set.
+        # Lists all the per-user managed configurations for the specified user. Only
+        # the ID is set.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] user_id
@@ -1533,10 +1444,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1549,38 +1458,42 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_managedconfigurationsforusers(enterprise_id, user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/users/{userId}/managedConfigurationsForUser', options)
+        def list_managedconfigurationsforusers(enterprise_id, user_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/managedConfigurationsForUser', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::ManagedConfigurationsForUserListResponse::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::ManagedConfigurationsForUserListResponse
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Adds or updates the managed configuration settings for an app for the
-        # specified user. If you support the Managed configurations iframe, you can
-        # apply managed configurations to a user by specifying an mcmId and its
-        # associated configuration variables (if any) in the request. Alternatively, all
-        # EMMs can apply managed configurations by passing a list of managed properties.
+        # specified user.
+        # If you support the <a
+        # href="https://developers.google.com/android/work/play/emm-api/managed-
+        # configurations-iframe">Managed
+        # configurations iframe</a>,
+        # you can apply managed configurations to a user by specifying an
+        # <code>mcmId</code>
+        # and its associated configuration variables (if any) in the request.
+        # Alternatively,
+        # all EMMs can apply managed configurations by passing a list of managed
+        # properties.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] user_id
         #   The ID of the user.
         # @param [String] managed_configuration_for_user_id
-        #   The ID of the managed configuration (a product ID), e.g. "app:com.google.
-        #   android.gm".
+        #   The ID of the managed configuration (a product ID), e.g.
+        #   "app:com.google.android.gm".
         # @param [Google::Apis::AndroidenterpriseV1::ManagedConfiguration] managed_configuration_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1593,8 +1506,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_managedconfigurationsforuser(enterprise_id, user_id, managed_configuration_for_user_id, managed_configuration_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:put, 'enterprises/{enterpriseId}/users/{userId}/managedConfigurationsForUser/{managedConfigurationForUserId}', options)
+        def update_managedconfigurationsforuser(enterprise_id, user_id, managed_configuration_for_user_id, managed_configuration_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:put, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/managedConfigurationsForUser/{managedConfigurationForUserId}', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::ManagedConfiguration::Representation
           command.request_object = managed_configuration_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::ManagedConfiguration::Representation
@@ -1604,7 +1517,6 @@ module Google
           command.params['managedConfigurationForUserId'] = managed_configuration_for_user_id unless managed_configuration_for_user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1612,14 +1524,13 @@ module Google
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] product_id
-        #   The ID of the product for which the managed configurations settings applies to.
+        #   The ID of the product for which the managed configurations settings applies
+        #   to.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1632,15 +1543,14 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_managedconfigurationssettings(enterprise_id, product_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/products/{productId}/managedConfigurationsSettings', options)
+        def list_managedconfigurationssettings(enterprise_id, product_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/products/{productId}/managedConfigurationsSettings', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::ManagedConfigurationsSettingsListResponse::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::ManagedConfigurationsSettingsListResponse
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['productId'] = product_id unless product_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1653,10 +1563,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1669,23 +1577,24 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_permission(permission_id, language: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'permissions/{permissionId}', options)
+        def get_permission(permission_id, language: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/permissions/{permissionId}', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::Permission::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::Permission
           command.params['permissionId'] = permission_id unless permission_id.nil?
           command.query['language'] = language unless language.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Approves the specified product and the relevant app permissions, if any. The
-        # maximum number of products that you can approve per enterprise customer is 1,
-        # 000.
-        # To learn how to use managed Google Play to design and create a store layout to
-        # display approved products to your users, see Store Layout Design.
+        # <p>Approves the specified product and the relevant app permissions, if any.
+        # The maximum number of products that you can approve per enterprise customer
+        # is 1,000.</p>
+        # <p>To learn how to use managed Google Play to design and create a store
+        # layout to display approved products to your users,
+        # see <a href="/android/work/play/emm-api/store-layout">Store Layout
+        # Design</a>.</p>
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] product_id
@@ -1694,10 +1603,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1710,40 +1617,39 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def approve_product(enterprise_id, product_id, approve_product_request_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/{enterpriseId}/products/{productId}/approve', options)
+        def approve_product(enterprise_id, product_id, approve_product_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'androidenterprise/v1/enterprises/{enterpriseId}/products/{productId}/approve', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::ApproveProductRequest::Representation
           command.request_object = approve_product_request_object
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['productId'] = product_id unless product_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Generates a URL that can be rendered in an iframe to display the permissions (
-        # if any) of a product. An enterprise admin must view these permissions and
-        # accept them on behalf of their organization in order to approve that product.
-        # Admins should accept the displayed permissions by interacting with a separate
-        # UI element in the EMM console, which in turn should trigger the use of this
-        # URL as the approvalUrlInfo.approvalUrl property in a Products.approve call to
-        # approve the product. This URL can only be used to display permissions for up
-        # to 1 day.
+        # Generates a URL that can be rendered in an iframe to display the
+        # permissions (if any) of a product. An enterprise admin must view these
+        # permissions and accept them on behalf of their organization in order to
+        # approve that product. <br><br>
+        # Admins should accept the displayed permissions by
+        # interacting with a separate UI element in the EMM console, which in turn
+        # should trigger the use of this URL as the
+        # <code>approvalUrlInfo.approvalUrl</code> property in a
+        # <code>Products.approve</code> call to approve the product.
+        # This URL can only be used to display permissions for up to 1 day.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] product_id
         #   The ID of the product.
         # @param [String] language_code
-        #   The BCP 47 language code used for permission names and descriptions in the
-        #   returned iframe, for instance "en-US".
+        #   The BCP 47 language code used for permission names and descriptions in
+        #   the returned iframe, for instance "en-US".
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1756,8 +1662,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def generate_product_approval_url(enterprise_id, product_id, language_code: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/{enterpriseId}/products/{productId}/generateApprovalUrl', options)
+        def generate_product_approval_url(enterprise_id, product_id, language_code: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'androidenterprise/v1/enterprises/{enterpriseId}/products/{productId}/generateApprovalUrl', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::GenerateProductApprovalUrlResponse::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::GenerateProductApprovalUrlResponse
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
@@ -1765,7 +1671,6 @@ module Google
           command.query['languageCode'] = language_code unless language_code.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1779,10 +1684,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1795,8 +1698,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_product(enterprise_id, product_id, language: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/products/{productId}', options)
+        def get_product(enterprise_id, product_id, language: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/products/{productId}', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::Product::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::Product
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
@@ -1804,16 +1707,17 @@ module Google
           command.query['language'] = language unless language.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieves the schema that defines the configurable properties for this product.
-        # All products have a schema, but this schema may be empty if no managed
-        # configurations have been defined. This schema can be used to populate a UI
-        # that allows an admin to configure the product. To apply a managed
-        # configuration based on the schema obtained using this API, see Managed
-        # Configurations through Play.
+        # Retrieves the schema that defines the configurable properties for this
+        # product. All products have a schema, but this schema may be empty if no
+        # managed configurations have been defined. This schema can be used to
+        # populate a UI that allows an admin to configure the product.
+        # To apply a managed configuration based on the schema obtained using this
+        # API, see
+        # <a href="/android/work/play/emm-api/managed-configurations">Managed
+        # Configurations through Play</a>.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] product_id
@@ -1823,10 +1727,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1839,8 +1741,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_product_app_restrictions_schema(enterprise_id, product_id, language: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/products/{productId}/appRestrictionsSchema', options)
+        def get_product_app_restrictions_schema(enterprise_id, product_id, language: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/products/{productId}/appRestrictionsSchema', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::AppRestrictionsSchema::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::AppRestrictionsSchema
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
@@ -1848,7 +1750,6 @@ module Google
           command.query['language'] = language unless language.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1860,10 +1761,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1876,48 +1775,46 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_product_permissions(enterprise_id, product_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/products/{productId}/permissions', options)
+        def get_product_permissions(enterprise_id, product_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/products/{productId}/permissions', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::ProductPermissions::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::ProductPermissions
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['productId'] = product_id unless product_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Finds approved products that match a query, or all approved products if there
-        # is no query.
+        # Finds approved products that match a query, or all approved products
+        # if there is no query.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [Boolean] approved
-        #   Specifies whether to search among all products (false) or among only products
-        #   that have been approved (true). Only "true" is supported, and should be
-        #   specified.
+        #   Specifies whether to search among all products (false) or among
+        #   only products that have been approved (true). Only "true" is
+        #   supported, and should be specified.
         # @param [String] language
-        #   The BCP47 tag for the user's preferred language (e.g. "en-US", "de"). Results
-        #   are returned in the language best matching the preferred language.
+        #   The BCP47 tag for the user's preferred language (e.g. "en-US", "de").
+        #   Results are returned in the language best matching the preferred
+        #   language.
         # @param [Fixnum] max_results
-        #   Specifies the maximum number of products that can be returned per request. If
-        #   not specified, uses a default value of 100, which is also the maximum
-        #   retrievable within a single response.
+        #   Defines how many results the list operation should return.
+        #   The default number depends on the resource collection.
         # @param [String] query
-        #   The search query as typed in the Google Play store search box. If omitted, all
-        #   approved apps will be returned (using the pagination parameters), including
-        #   apps that are not available in the store (e.g. unpublished apps).
+        #   The search query as typed in the Google Play store search box.
+        #   If omitted, all approved apps will be returned (using the pagination
+        #   parameters), including apps that are not available in the store
+        #   (e.g. unpublished apps).
         # @param [String] token
-        #   A pagination token is contained in a request's response when there are more
-        #   products. The token can be used in a subsequent request to obtain more
-        #   products, and so forth. This parameter cannot be used in the initial request.
+        #   Defines the token of the page to return, usually taken from
+        #   TokenPagination.
+        #   This can only be used if token paging is enabled.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1930,8 +1827,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_products(enterprise_id, approved: nil, language: nil, max_results: nil, query: nil, token: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/products', options)
+        def list_products(enterprise_id, approved: nil, language: nil, max_results: nil, query: nil, token: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/products', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::ProductsListResponse::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::ProductsListResponse
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
@@ -1942,7 +1839,6 @@ module Google
           command.query['token'] = token unless token.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1954,10 +1850,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1970,20 +1864,19 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def unapprove_product(enterprise_id, product_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/{enterpriseId}/products/{productId}/unapprove', options)
+        def unapprove_product(enterprise_id, product_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'androidenterprise/v1/enterprises/{enterpriseId}/products/{productId}/unapprove', options)
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['productId'] = product_id unless product_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Removes and invalidates the specified credentials for the service account
         # associated with this enterprise. The calling service account must have been
-        # retrieved by calling Enterprises.GetServiceAccount and must have been set as
-        # the enterprise service account by calling Enterprises.SetAccount.
+        # retrieved by calling Enterprises.GetServiceAccount and must have been set
+        # as the enterprise service account by calling Enterprises.SetAccount.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] key_id
@@ -1991,10 +1884,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2007,31 +1898,29 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_serviceaccountkey(enterprise_id, key_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'enterprises/{enterpriseId}/serviceAccountKeys/{keyId}', options)
+        def delete_serviceaccountkey(enterprise_id, key_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:delete, 'androidenterprise/v1/enterprises/{enterpriseId}/serviceAccountKeys/{keyId}', options)
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['keyId'] = key_id unless key_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Generates new credentials for the service account associated with this
         # enterprise. The calling service account must have been retrieved by calling
-        # Enterprises.GetServiceAccount and must have been set as the enterprise service
-        # account by calling Enterprises.SetAccount.
-        # Only the type of the key should be populated in the resource to be inserted.
+        # Enterprises.GetServiceAccount and must have been set as the enterprise
+        # service account by calling Enterprises.SetAccount. <br><br>
+        # Only the type of the key should be populated in the resource to be
+        # inserted.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [Google::Apis::AndroidenterpriseV1::ServiceAccountKey] service_account_key_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2044,8 +1933,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def insert_serviceaccountkey(enterprise_id, service_account_key_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/{enterpriseId}/serviceAccountKeys', options)
+        def insert_serviceaccountkey(enterprise_id, service_account_key_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'androidenterprise/v1/enterprises/{enterpriseId}/serviceAccountKeys', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::ServiceAccountKey::Representation
           command.request_object = service_account_key_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::ServiceAccountKey::Representation
@@ -2053,24 +1942,21 @@ module Google
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Lists all active credentials for the service account associated with this
-        # enterprise. Only the ID and key type are returned. The calling service account
-        # must have been retrieved by calling Enterprises.GetServiceAccount and must
-        # have been set as the enterprise service account by calling Enterprises.
-        # SetAccount.
+        # enterprise. Only the ID and key type are returned. The calling service
+        # account must have been retrieved by calling Enterprises.GetServiceAccount
+        # and must have been set as the enterprise service account by calling
+        # Enterprises.SetAccount.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2083,14 +1969,13 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_serviceaccountkeys(enterprise_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/serviceAccountKeys', options)
+        def list_serviceaccountkeys(enterprise_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/serviceAccountKeys', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::ServiceAccountKeysListResponse::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::ServiceAccountKeysListResponse
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -2104,10 +1989,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2120,14 +2003,13 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_storelayoutcluster(enterprise_id, page_id, cluster_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'enterprises/{enterpriseId}/storeLayout/pages/{pageId}/clusters/{clusterId}', options)
+        def delete_storelayoutcluster(enterprise_id, page_id, cluster_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:delete, 'androidenterprise/v1/enterprises/{enterpriseId}/storeLayout/pages/{pageId}/clusters/{clusterId}', options)
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['pageId'] = page_id unless page_id.nil?
           command.params['clusterId'] = cluster_id unless cluster_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -2141,10 +2023,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2157,8 +2037,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_storelayoutcluster(enterprise_id, page_id, cluster_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/storeLayout/pages/{pageId}/clusters/{clusterId}', options)
+        def get_storelayoutcluster(enterprise_id, page_id, cluster_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/storeLayout/pages/{pageId}/clusters/{clusterId}', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::StoreCluster::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::StoreCluster
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
@@ -2166,7 +2046,6 @@ module Google
           command.params['clusterId'] = cluster_id unless cluster_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -2179,10 +2058,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2195,8 +2072,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def insert_storelayoutcluster(enterprise_id, page_id, store_cluster_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/{enterpriseId}/storeLayout/pages/{pageId}/clusters', options)
+        def insert_storelayoutcluster(enterprise_id, page_id, store_cluster_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'androidenterprise/v1/enterprises/{enterpriseId}/storeLayout/pages/{pageId}/clusters', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::StoreCluster::Representation
           command.request_object = store_cluster_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::StoreCluster::Representation
@@ -2205,7 +2082,6 @@ module Google
           command.params['pageId'] = page_id unless page_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -2217,10 +2093,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2233,15 +2107,14 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_storelayoutclusters(enterprise_id, page_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/storeLayout/pages/{pageId}/clusters', options)
+        def list_storelayoutclusters(enterprise_id, page_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/storeLayout/pages/{pageId}/clusters', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::StoreLayoutClustersListResponse::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::StoreLayoutClustersListResponse
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['pageId'] = page_id unless page_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -2256,10 +2129,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2272,8 +2143,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_storelayoutcluster(enterprise_id, page_id, cluster_id, store_cluster_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:put, 'enterprises/{enterpriseId}/storeLayout/pages/{pageId}/clusters/{clusterId}', options)
+        def update_storelayoutcluster(enterprise_id, page_id, cluster_id, store_cluster_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:put, 'androidenterprise/v1/enterprises/{enterpriseId}/storeLayout/pages/{pageId}/clusters/{clusterId}', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::StoreCluster::Representation
           command.request_object = store_cluster_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::StoreCluster::Representation
@@ -2283,7 +2154,6 @@ module Google
           command.params['clusterId'] = cluster_id unless cluster_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -2295,10 +2165,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2311,13 +2179,12 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_storelayoutpage(enterprise_id, page_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'enterprises/{enterpriseId}/storeLayout/pages/{pageId}', options)
+        def delete_storelayoutpage(enterprise_id, page_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:delete, 'androidenterprise/v1/enterprises/{enterpriseId}/storeLayout/pages/{pageId}', options)
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['pageId'] = page_id unless page_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -2329,10 +2196,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2345,15 +2210,14 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_storelayoutpage(enterprise_id, page_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/storeLayout/pages/{pageId}', options)
+        def get_storelayoutpage(enterprise_id, page_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/storeLayout/pages/{pageId}', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::StorePage::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::StorePage
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['pageId'] = page_id unless page_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -2364,10 +2228,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2380,8 +2242,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def insert_storelayoutpage(enterprise_id, store_page_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/{enterpriseId}/storeLayout/pages', options)
+        def insert_storelayoutpage(enterprise_id, store_page_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'androidenterprise/v1/enterprises/{enterpriseId}/storeLayout/pages', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::StorePage::Representation
           command.request_object = store_page_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::StorePage::Representation
@@ -2389,7 +2251,6 @@ module Google
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -2399,10 +2260,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2415,14 +2274,13 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_storelayoutpages(enterprise_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/storeLayout/pages', options)
+        def list_storelayoutpages(enterprise_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/storeLayout/pages', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::StoreLayoutPagesListResponse::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::StoreLayoutPagesListResponse
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -2435,10 +2293,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2451,8 +2307,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_storelayoutpage(enterprise_id, page_id, store_page_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:put, 'enterprises/{enterpriseId}/storeLayout/pages/{pageId}', options)
+        def update_storelayoutpage(enterprise_id, page_id, store_page_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:put, 'androidenterprise/v1/enterprises/{enterpriseId}/storeLayout/pages/{pageId}', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::StorePage::Representation
           command.request_object = store_page_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::StorePage::Representation
@@ -2461,7 +2317,6 @@ module Google
           command.params['pageId'] = page_id unless page_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -2473,10 +2328,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2489,19 +2342,18 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_user(enterprise_id, user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'enterprises/{enterpriseId}/users/{userId}', options)
+        def delete_user(enterprise_id, user_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:delete, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}', options)
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Generates an authentication token which the device policy client can use to
-        # provision the given EMM-managed user account on a device. The generated token
-        # is single-use and expires after a few minutes.
+        # provision the given EMM-managed user account on a device.
+        # The generated token is single-use and expires after a few minutes.
         # You can provision a maximum of 10 devices per user.
         # This call only works with EMM-managed accounts.
         # @param [String] enterprise_id
@@ -2511,10 +2363,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2527,54 +2377,14 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def generate_user_authentication_token(enterprise_id, user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/{enterpriseId}/users/{userId}/authenticationToken', options)
+        def generate_user_authentication_token(enterprise_id, user_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/authenticationToken', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::AuthenticationToken::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::AuthenticationToken
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
-          execute_or_queue_command(command, &block)
-        end
-        
-        # Generates a token (activation code) to allow this user to configure their
-        # managed account in the Android Setup Wizard. Revokes any previously generated
-        # token.
-        # This call only works with Google managed accounts.
-        # @param [String] enterprise_id
-        #   The ID of the enterprise.
-        # @param [String] user_id
-        #   The ID of the user.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
-        # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
-        # @param [Google::Apis::RequestOptions] options
-        #   Request-specific options
-        #
-        # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AndroidenterpriseV1::UserToken] parsed result object
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @return [Google::Apis::AndroidenterpriseV1::UserToken]
-        #
-        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
-        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
-        # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def generate_user_token(enterprise_id, user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/{enterpriseId}/users/{userId}/token', options)
-          command.response_representation = Google::Apis::AndroidenterpriseV1::UserToken::Representation
-          command.response_class = Google::Apis::AndroidenterpriseV1::UserToken
-          command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
-          command.params['userId'] = user_id unless user_id.nil?
-          command.query['fields'] = fields unless fields.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -2586,10 +2396,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2602,15 +2410,14 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_user(enterprise_id, user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/users/{userId}', options)
+        def get_user(enterprise_id, user_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::User::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::User
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -2622,10 +2429,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2638,34 +2443,32 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_user_available_product_set(enterprise_id, user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/users/{userId}/availableProductSet', options)
+        def get_user_available_product_set(enterprise_id, user_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/availableProductSet', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::ProductSet::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::ProductSet
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Creates a new EMM-managed user.
-        # The Users resource passed in the body of the request should include an
-        # accountIdentifier and an accountType.
-        # If a corresponding user already exists with the same account identifier, the
-        # user will be updated with the resource. In this case only the displayName
-        # field can be changed.
+        # The <a href="/android/work/play/emm-api/v1/users.html">Users</a> resource
+        # passed in the body of the request should include an
+        # <code>accountIdentifier</code> and an <code>accountType</code>.
+        # <p>If a corresponding user already exists with the same account identifier,
+        # the user will be updated with the resource. In this case only the
+        # <code>displayName</code> field can be changed.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [Google::Apis::AndroidenterpriseV1::User] user_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2678,8 +2481,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def insert_user(enterprise_id, user_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/{enterpriseId}/users', options)
+        def insert_user(enterprise_id, user_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'androidenterprise/v1/enterprises/{enterpriseId}/users', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::User::Representation
           command.request_object = user_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::User::Representation
@@ -2687,24 +2490,22 @@ module Google
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Looks up a user by primary email address. This is only supported for Google-
-        # managed users. Lookup of the id is not needed for EMM-managed users because
-        # the id is already returned in the result of the Users.insert call.
+        # Looks up a user by primary email address.
+        # This is only supported for Google-managed users.  Lookup of the id is not
+        # needed for EMM-managed users because the id is already returned in the
+        # result of the Users.insert call.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] email
-        #   The exact primary email address of the user to look up.
+        #   Required. The exact primary email address of the user to look up.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2717,21 +2518,20 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_users(enterprise_id, email, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/users', options)
+        def list_users(enterprise_id, email, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/users', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::ListUsersResponse::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::ListUsersResponse
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.query['email'] = email unless email.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Revokes access to all devices currently provisioned to the user. The user will
-        # no longer be able to use the managed Play store on any of their managed
-        # devices.
+        # Revokes access to all devices currently provisioned to the user. The user
+        # will no longer be able to use the managed Play store on any of their
+        # managed devices.
         # This call only works with EMM-managed accounts.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
@@ -2740,44 +2540,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
-        # @param [Google::Apis::RequestOptions] options
-        #   Request-specific options
-        #
-        # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [NilClass] No result returned for this method
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @return [void]
-        #
-        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
-        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
-        # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def revoke_user_device_access(enterprise_id, user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'enterprises/{enterpriseId}/users/{userId}/deviceAccess', options)
-          command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
-          command.params['userId'] = user_id unless user_id.nil?
-          command.query['fields'] = fields unless fields.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
-          execute_or_queue_command(command, &block)
-        end
-        
-        # Revokes a previously generated token (activation code) for the user.
-        # @param [String] enterprise_id
-        #   The ID of the enterprise.
-        # @param [String] user_id
-        #   The ID of the user.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
-        # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2790,19 +2554,20 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def revoke_user_token(enterprise_id, user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'enterprises/{enterpriseId}/users/{userId}/token', options)
+        def revoke_user_device_access(enterprise_id, user_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:delete, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/deviceAccess', options)
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Modifies the set of products that a user is entitled to access (referred to as
-        # whitelisted products). Only products that are approved or products that were
-        # previously approved (products with revoked approval) can be whitelisted.
+        # Modifies the set of products that a user is entitled to access (referred to
+        # as <em>whitelisted</em> products). Only products that are
+        # <a href="/android/work/play/emm-api/v1/products/approve">approved</a>
+        # or products that were previously approved (products with revoked approval)
+        # can be whitelisted.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] user_id
@@ -2811,10 +2576,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2827,8 +2590,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def set_user_available_product_set(enterprise_id, user_id, product_set_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:put, 'enterprises/{enterpriseId}/users/{userId}/availableProductSet', options)
+        def set_user_available_product_set(enterprise_id, user_id, product_set_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:put, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}/availableProductSet', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::ProductSet::Representation
           command.request_object = product_set_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::ProductSet::Representation
@@ -2837,15 +2600,16 @@ module Google
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Updates the details of an EMM-managed user.
-        # Can be used with EMM-managed users only (not Google managed users). Pass the
-        # new details in the Users resource in the request body. Only the displayName
-        # field can be changed. Other fields must either be unset or have the currently
-        # active value.
+        # Can be used with EMM-managed users only (not Google managed users).
+        # Pass the new details in the
+        # <a href="/android/work/play/emm-api/v1/users.html">Users</a>
+        # resource in the request body. Only the <code>displayName</code> field
+        # can be changed. Other fields must either be unset or have the
+        # currently active value.
         # @param [String] enterprise_id
         #   The ID of the enterprise.
         # @param [String] user_id
@@ -2854,10 +2618,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2870,8 +2632,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_user(enterprise_id, user_id, user_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:put, 'enterprises/{enterpriseId}/users/{userId}', options)
+        def update_user(enterprise_id, user_id, user_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:put, 'androidenterprise/v1/enterprises/{enterpriseId}/users/{userId}', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::User::Representation
           command.request_object = user_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::User::Representation
@@ -2880,7 +2642,6 @@ module Google
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -2892,10 +2653,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2908,13 +2667,12 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_webapp(enterprise_id, web_app_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'enterprises/{enterpriseId}/webApps/{webAppId}', options)
+        def delete_webapp(enterprise_id, web_app_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:delete, 'androidenterprise/v1/enterprises/{enterpriseId}/webApps/{webAppId}', options)
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['webAppId'] = web_app_id unless web_app_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -2926,10 +2684,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2942,15 +2698,14 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_webapp(enterprise_id, web_app_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/webApps/{webAppId}', options)
+        def get_webapp(enterprise_id, web_app_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/webApps/{webAppId}', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::WebApp::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::WebApp
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.params['webAppId'] = web_app_id unless web_app_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -2961,10 +2716,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2977,8 +2730,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def insert_webapp(enterprise_id, web_app_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:post, 'enterprises/{enterpriseId}/webApps', options)
+        def insert_webapp(enterprise_id, web_app_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:post, 'androidenterprise/v1/enterprises/{enterpriseId}/webApps', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::WebApp::Representation
           command.request_object = web_app_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::WebApp::Representation
@@ -2986,7 +2739,6 @@ module Google
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -2996,10 +2748,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -3012,14 +2762,13 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_webapps(enterprise_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:get, 'enterprises/{enterpriseId}/webApps', options)
+        def list_webapps(enterprise_id, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:get, 'androidenterprise/v1/enterprises/{enterpriseId}/webApps', options)
           command.response_representation = Google::Apis::AndroidenterpriseV1::WebAppsListResponse::Representation
           command.response_class = Google::Apis::AndroidenterpriseV1::WebAppsListResponse
           command.params['enterpriseId'] = enterprise_id unless enterprise_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -3032,10 +2781,8 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   An opaque string that represents a user for quota purposes. Must not exceed 40
-        #   characters.
-        # @param [String] user_ip
-        #   Deprecated. Please use quotaUser instead.
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -3048,8 +2795,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_webapp(enterprise_id, web_app_id, web_app_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          command = make_simple_command(:put, 'enterprises/{enterpriseId}/webApps/{webAppId}', options)
+        def update_webapp(enterprise_id, web_app_id, web_app_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command = make_simple_command(:put, 'androidenterprise/v1/enterprises/{enterpriseId}/webApps/{webAppId}', options)
           command.request_representation = Google::Apis::AndroidenterpriseV1::WebApp::Representation
           command.request_object = web_app_object
           command.response_representation = Google::Apis::AndroidenterpriseV1::WebApp::Representation
@@ -3058,7 +2805,6 @@ module Google
           command.params['webAppId'] = web_app_id unless web_app_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
 
@@ -3067,7 +2813,6 @@ module Google
         def apply_command_defaults(command)
           command.query['key'] = key unless key.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
         end
       end
     end