Merge "Avoid NPEs when WifiNetworkAgent undefined." into oc-mr1-dev
tree: 000b7dc70c6b71d5f81466baf05571aa6554fa96
  1. service/
  2. PREUPLOAD.cfg