Merge "Fix coding rules" into tizen