Merge "Add feature definition for Wi-Fi Direct"