Merge changes from topics "capport_dhcpresults", "nm_cb_capport" am: f202725395

Change-Id: I22bbbb598aaca6ba6c73ab37d34e855ec0def48f