Bugzilla/1062819 pickup rebased/mobile connection core

Any reason we don't do this in the constructor function?