Merge "Adding missing NI_TYPE for emergency SUPL" into oc-dev
am: 12d67e3c7a

Change-Id: I4891c240fd6e73d0c3e4836a9286977b23f936b0