am 537dc873: am aad37a1e: Merge "Validate restored file paths against their...
am 537dc873: am aad37a1e: Merge "Validate restored file paths against their nominal domain" into jb-mr2-dev
* commit '537dc873':
Validate restored file paths against their nominal domain