Merge changes from topics "capport_dhcpresults", "nm_cb_capport" am: 66b08c6e20 am: 7afcf10ca6 am: d45ab73281

Change-Id: Ie27e5dfd51b38194fa104cbd73f9bbe7c4395e0f
tree: 8872bbb36e8ba6cb84a332f538076a7eb893897b
  1. core/
  2. services/
  3. tests/