Merge "add wifi config for power calculation" into m-wireless-dev