am 93e8e0a0: (-s ours) am e01c162a: am efb70fd8: Merge "Cherry pick beefed-up error handling in the CopyService from master. DO NOT MERGE" into mnc-dev
* commit '93e8e0a0':
Cherry pick beefed-up error handling in the CopyService from master. DO NOT MERGE