Merge "Adding SUPL NI Emergency Extension Time" into pi-dev