Merge "wfd : Correcting declaration of wfdservice"