Merge "Update eventTime to prevent stale events"