Merge "Add sanity check for mac address & WPS device type"