Merge remote-tracking branch 'tizen-gerrit/cynara' into HEAD