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