am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev * commit 'bba79795': Sanity-check paths of files to be restored