Merge "Change test string without a space character" into froyo