Merge "Fix doc of NETWORK_TYPE_NR & add converter"