Merge "Fix N_SE-46349" into tizen_2.2