Merge "Revert "Add DhcpLeaseCallbacks""