Merge "fixes for static analysis tool results" into tizen_2.1