Merge "Fix N_SE-46297" into tizen_2.2