am 6c644f24: Merge change 26379 into eclair

Merge commit '6c644f248f553898248b8a6948fac4d62874fedd' into eclair-plus-aosp

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