Merge "Update satellite error codes"