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

* commit 'e74007ded3a34d6aaf7dc4fe7f2c18b04b47de3b':
  Clean up error handling in CopyService.