Merge "Fix case where Emergency SUPL NI should be denied"