Merge "WFD: Add additional policies for wfdservice"