Merge "Fix potential format string vulnerability"