Bugzilla/1062819 pickup rebased/mobile connection core

this should be extracted into a mock