[polymer] Merge of master into polymer10-migration

telemetry/telemetry/core/cros_interface.py

Index: telemetry/telemetry/core/cros_interface.py
diff --git a/telemetry/telemetry/core/cros_interface.py b/telemetry/telemetry/core/cros_interface.py
index 9a82c8b863d641d6eec211cbc7f1fc081baa53e7..d63a9e885731bed1bf6c8567f84c11c09f686e35 100644
--- a/telemetry/telemetry/core/cros_interface.py
+++ b/telemetry/telemetry/core/cros_interface.py
@@ -306,7 +306,9 @@ class CrOSInterface(object):
     if self.local:
       if destfile is not None and destfile != filename:
         shutil.copyfile(filename, destfile)
-      return
+        return
+      else:
+        raise OSError('No such file or directory %s' % filename)
 
     if destfile is None:
       destfile = os.path.basename(filename)