Merge "Add definitions for WiMAX and iDen network types."