Merge change 26379 into eclair

* changes:
  Add parameter for the restore set (device id) data is being restored from to the restore_start event