Merge "Fix doc of NETWORK_TYPE_NR & add converter" am: 1abe6aa53f
am: a4e9cec4b3

Change-Id: Ic2bea19fad4095c4f16b34691bbb6ff39546cb19