Merge "Revert "WFD : Add WFD specific security policies""