Merge "Rollback changed iotcon API." into tizen

No match.