Merge "Switch Wi-Fi HAL policy to _client/_server"