Merge "Remove unnecessary dead variable and unnecessary include" into tizen