Merge "Reduce GpsStatus API crashes to SDK S+"