Merge "Fix WiFi-Direct." into lmp-dev