Merge "Update NETWORK_CONNECTION_EVENT netId after WPS" into oc-mr1-dev
tree: f75efcd31d7b11dcbf03e7149fefcf1f0bf5d4aa
  1. service/
  2. PREUPLOAD.cfg