Merge remote branch 'cros/upstream' into master

frontend/migrations/062_drone_sets_unique.py

 import common
 from autotest_lib.database import db_utils
 
 UP_SQL = """
 CREATE INDEX afe_drone_sets_drones_droneset_ibfk
 ON afe_drone_sets_drones (droneset_id);
 
 ALTER TABLE afe_drone_sets_drones
 DROP KEY afe_drone_sets_drones_unique;
 
@@ skipping 23 matching lines @@
 ALTER TABLE afe_drone_sets_drones
 DROP KEY afe_drone_sets_drones_droneset_ibfk;
 """
 
 
 def migrate_up(manager):
     query = ('SELECT * FROM afe_drone_sets_drones '
              'GROUP BY drone_id HAVING COUNT(*) > 1')
     rows = manager.execute(query)
     if rows:
-      raise Exception('Some drones are associated with more than one drone '
-                      'set. Please remove all duplicates before running this '
-                      'migration.')
+        raise Exception('Some drones are associated with more than one drone '
+                        'set. Please remove all duplicates before running this '
+                        'migration.')
     manager.execute_script(UP_SQL)
 
     if db_utils.check_index_exists(manager, 'afe_drone_sets_drones',
                                    'afe_drone_sets_drones_drone_ibfk'):
         manager.execute(DROP_KEY_SQL)