Merge changes I11475732,I8de27f2b into oc-dev

* changes:
  WifiServiceImpl: check calls to enable wifi
  WifiServiceImpl: test setWifiEnabled
tree: 76159abf372109fcdbdb6755754d1c23d94d5a62
  1. service/
  2. PREUPLOAD.cfg