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 'bca67fd7d0747a950e88525d216af41272b20763':
  Sanity-check paths of files to be restored