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