Merge "Merge "expose the UID in the EventLog API" into oc-dev am: 8ae5e04636 am: 21abf1cd20"