Merge "Fix static analysis" into tizen