Merge changes from topics "capport_dhcpresults", "nm_cb_capport" am: f202725395 am: 2c7a224e1b am: b7c9d205bf

Change-Id: Ie27e5dfd51b38194fa104cbd73f9bbe7c4395e0f