Merge "Fix N_SE-52213" into tizen_2.2