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

Change-Id: I8b8e4add020ec8011bc1d41fc6537f750c309754