Merge "fs_mgr: validate corrected signatures" into nyc-dev