Merge "Add new network type for HSPA+."