Merge "merge UTs fixes to Tizen_2.1" into tizen_2.1