Merge "Moved MVNO matching logic out of old data stack" into tm-dev