Merge "fix klocwork issue" into tizen_2.2