Merge "Revert "Apply model-config.xml"" into tizen_2.2