Merge "wifi hostapd: add to current.xml"