Merge "Use updated satellite error codes"