Merge "Add vvm type for t-mobile." into mnc-dev