Merge "N_SE-43925" into tizen_2.2