am 9aaf54ee: am 71b19fc3: am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev

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