am d3c72606: Merge "Clean up error handling/reporting in file_sync_service.cpp."

* commit 'd3c726064aa8e676ca4756e8461a5732b16aa7a9':
  Clean up error handling/reporting in file_sync_service.cpp.