Merge changes I1c24c60d,I1e8998c9 into oc-dev

* changes:
  WifiStateMachine: Reset network ID for WPS
  InformationElementUtil: Handle malformed scan results
tree: 9b85d08849de80da58ea79348688d9f76231f90c
  1. libwifi_hal/
  2. libwifi_system/
  3. service/
  4. tests/
  5. PREUPLOAD.cfg