Merge "Fix DCM-1933" into tizen_2.2