Merge "Return empty string for new error code. The new string will be defined later." into froyo