Merge "Support coexistence of wpa and wpa2 IEs in scan result" into oc-dev
tree: dc3ca0990bff88e0a6225b2e0e9dac2e1d053461
  1. service/
  2. PREUPLOAD.cfg