Merge "Store preferential network service config in xml" into tm-dev