Merge "Fixing TDIS-6353." into tizen_2.2