Household Demand for Improved Water Services in Ho Chi Minh City: A Comparison of Contingent Valuation and Choice Modeling Estimates