Merge "Fix issue detected by static analysis tool" into tizen