Merge "Fix the mistake of code indent"