Applied changes from EFL and wifi-direct APIS