am 407aa6d9: am b914e9bd: am ae6bfa5f: am 432200da: am c0471f7a: am bca67fd7: 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 '407aa6d90c7f3ba1c6a5a3c0eaa0ef5857655fd2':
  Sanity-check paths of files to be restored