Update from https://crrev.com/327068

build/android/pylib/remote/device/remote_device_environment.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Environment setup and teardown for remote devices."""
 
 import distutils.version
 import json
 import logging
 import os
@@ skipping 55 matching lines @@
     else:
       device_json = {}
 
     self._api_address = device_json.get('api_address', None)
     self._api_key = device_json.get('api_key', None)
     self._api_port = device_json.get('api_port', None)
     self._api_protocol = device_json.get('api_protocol', None)
     self._api_secret = device_json.get('api_secret', None)
     self._device_oem = device_json.get('device_oem', None)
     self._device_type = device_json.get('device_type', 'Android')
+    self._network_config = device_json.get('network_config', None)
     self._remote_device = device_json.get('remote_device', None)
     self._remote_device_minimum_os = device_json.get(
         'remote_device_minimum_os', None)
     self._remote_device_os = device_json.get('remote_device_os', None)
     self._remote_device_timeout = device_json.get('remote_device_timeout', None)
     self._results_path = device_json.get('results_path', None)
     self._runner_package = device_json.get('runner_package', None)
     self._runner_type = device_json.get('runner_type', None)
-    if 'timeouts' in device_json:
-      for key in device_json['timeouts']:
-        self._timeouts[key] = device_json['timeouts'][key]
+    self._timeouts.update(device_json.get('timeouts', {}))
 
     def command_line_override(
         file_value, cmd_line_value, desc, print_value=True):
       if cmd_line_value:
         if file_value and file_value != cmd_line_value:
           if print_value:
             logging.info('Overriding %s from %s to %s',
                          desc, file_value, cmd_line_value)
           else:
             logging.info('overriding %s', desc)
         return cmd_line_value
       return file_value
 
     self._api_address = command_line_override(
         self._api_address, args.api_address, 'api_address')
     self._api_port = command_line_override(
         self._api_port, args.api_port, 'api_port')
     self._api_protocol = command_line_override(
         self._api_protocol, args.api_protocol, 'api_protocol')
     self._device_oem = command_line_override(
         self._device_oem, args.device_oem, 'device_oem')
     self._device_type = command_line_override(
         self._device_type, args.device_type, 'device_type')
+    self._network_config = command_line_override(
+        self._network_config, args.network_config, 'network_config')
     self._remote_device = command_line_override(
         self._remote_device, args.remote_device, 'remote_device')
     self._remote_device_minimum_os = command_line_override(
         self._remote_device_minimum_os, args.remote_device_minimum_os,
         'remote_device_minimum_os')
     self._remote_device_os = command_line_override(
         self._remote_device_os, args.remote_device_os, 'remote_device_os')
     self._remote_device_timeout = command_line_override(
         self._remote_device_timeout, args.remote_device_timeout,
         'remote_device_timeout')
@@ skipping 198 matching lines @@
 
   @property
   def collect(self):
     return self._collect
 
   @property
   def device_type_id(self):
     return self._device['device_type_id']
 
   @property
+  def network_config(self):
+    return self._network_config
+
+  @property
   def only_output_failures(self):
     # TODO(jbudorick): Remove this once b/18981674 is fixed.
     return True
 
   @property
   def results_path(self):
     return self._results_path
 
   @property
   def runner_package(self):
@@ skipping 15 matching lines @@
   def trigger(self):
     return self._trigger
 
   @property
   def verbose_count(self):
     return self._verbose_count
 
   @property
   def device_type(self):
     return self._device_type