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

Change-Id: Ife1b2c42dede9258e1f74d52583a63eb49a2e1a0