Merge "Use the SubId in the TM.getNetworkType if Valid"