Merge "Fix referenced before assignment for BuildCompletedEvent"