Fix issue in merged code for Tizen 3.0