Merge "Fix Jira issue for db retry mechanism" into tizen_2.1