Merge "Fix a fd mis-match" into tizen_2.1