Merge "Fix for bug 2558156: Encodig is null" into froyo