Merge changes from topic "del-factory-and-networkagent-wifi" am: ea4d07c802

Change-Id: I8b8e4add020ec8011bc1d41fc6537f750c309754
tree: 48b0fdb4942afdcc14068858cea0c27564429ae1
  1. core/
  2. services/
  3. tests/