Fix SystemInfo in tizen module
Commit after fixing conflicts