Merge "Fix SDK build problem until EventLog is published."