Bugzilla/1062819 pickup rebased/mobile connection core

I wonder do it in mock_system will make us have a big mock_system in the end...