Merge remote-tracking branch 'contacts-service/tizen'