Bugzilla/1062819 pickup rebased/mobile connection core

nit: We could use `index` directly.