HOUSEHOLD DEMAND FOR IMPROVED WATER SERVICE IN URBAN AREAS: THE CASE OF ADDIS ABABA, ETHIOPIA