Merge "Un-deprecate getDhcpInfo" into klp-dev