am be008eac: am 6a6bd17f: Merge "Delete AllocationTimer"

* commit 'be008eacaa1de31fb00e6902d30b4188f1904519':
  Delete AllocationTimer