Merge "Delete AllocationTimer"