Merge "Fix wording on WifiSsidPolicy" into udc-dev