Merge "Fix some line indent of string concat"