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

Change-Id: I4b413866cbf6d0b888f9b67e0c5725cd0068ea91