am 6a6bd17f: Merge "Delete AllocationTimer"

* commit '6a6bd17f68c02139630796a615bd38b929c02e7a':
  Delete AllocationTimer