Merge "[automerger skipped] Merge "Fix doc of NETWORK_TYPE_NR & add converter" am: 1abe6aa53f am: a4e9cec4b3 am: 8a5c3bc6c2 -s ours am skip reason: change_id Ib9ee0dbe0234ef1bf9ef22900b00ddd47195914f with SHA1 3955593f7e is in history"