Resolved merging issues in tizen connectivity build.