Merge "Fix a FormatFlagsConversionMismatchException bug I introduced in Froyo."