am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev

* commit 'e2adb1ff4af09d66096df64461c80d4126ab2692':
  Sanity-check paths of files to be restored