Merge changes I38c31645,Ib6f61b81 into oc-mr1-dev

* changes:
  WifiStateMachine: Handle WifiManager.save() when wifi is off
  NetworkListStoreData: Set creatorUid for all networks on load
tree: 8589786a66cef01747efc2e7e199ba0c891d0ba7
  1. service/
  2. PREUPLOAD.cfg