Merge changes I1c24c60d,I1e8998c9 into oc-dev

* changes:
  WifiStateMachine: Reset network ID for WPS
  InformationElementUtil: Handle malformed scan results
tree: ef7fbc0c1fd0dd88430e2c48aecb63763983c1a6
  1. service/
  2. PREUPLOAD.cfg