Merge "Cherry pick beefed-up error handling in the CopyService from master.  DO NOT MERGE" into mnc-dev