Merge "Fix svace 'UNREACHABLE_CODE.NO_PATH' warnings" into tizen