Merge "Add Wifi Protected Setup support"