Merge "Fix the coding style errors" into tizen