Merge "fix coding standard problem"