Merge "Fix a bug by wrong declaration" into tizen