Merge "Remove dependency on DhcpResults callbacks"