Merge "Clean up error handling in CopyService." into mnc-dev