Update from https://crrev.com/311076

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 logging
 import os
 import random
 import sys
@@ skipping 44 matching lines @@
     self._api_port = args.api_port
 
     self._access_token = ''
     self._results_path = args.results_path
     self._remote_device = args.remote_device
     self._remote_device_os = args.remote_device_os
     self._runner_package = args.runner_package
     self._runner_type = args.runner_type
     self._device = ''
     self._verbose_count = args.verbose_count
+    self._timeouts = {
+        'queueing': 60 * 10,
+        'installing': 60 * 10,
+        'in-progress': 60 * 30,
+        'unknown': 60 * 5
+    }
 
     if not args.trigger and not args.collect:
       self._trigger = True
       self._collect = True
     else:
       self._trigger = args.trigger
       self._collect = args.collect
 
   def SetUp(self):
     """Set up the test environment."""
@@ skipping 53 matching lines @@
     device_list = dev_list_res.json()['response']
     random.shuffle(device_list)
     for device in device_list:
       if device['os_name'] != 'Android':
         continue
       if self._remote_device and device['name'] != self._remote_device:
         continue
       if (self._remote_device_os
           and device['os_version'] != self._remote_device_os):
         continue
-      if device['available_devices_count'] > 0:
+      if ((self._remote_device and self._remote_device_os)
+          or device['available_devices_count']):
         logging.info('Found device: %s %s',
                      device['name'], device['os_version'])
         return device['device_type_id']
     self._NoDeviceFound(device_list)
 
   def _PrintAvailableDevices(self, device_list):
     def compare_devices(a,b):
       for key in ('os_version', 'name'):
         c = cmp(a[key], b[key])
         if c:
@@ skipping 33 matching lines @@
   def trigger(self):
     return self._trigger
 
   @property
   def collect(self):
     return self._collect
 
   @property
   def verbose_count(self):
     return self._verbose_count
+
+  @property
+  def timeouts(self):
+    return self._timeouts