Merge "Fix test failure in NetworkListStoreDataTest and WifiConfigStoreTest" into oc-mr1-dev
tree: 8db58baa56dd3abce48c8fe4e14681533e528d0c
  1. service/
  2. PREUPLOAD.cfg