Merge "expose the UID in the EventLog API" into oc-dev