Reviewed-by: darcy, weijun
Updated the US_ASCII and ISO-8859-1 to fix the failure. Reviewed-by: alanb, martin