Merge "Fix compatibility issues on SystemInfo" into tizen_2.1