Merge "Fix allocation count" am: b25116f735
am: 4b5d182fd5

* commit '4b5d182fd5055a4052237785164f543fe49b8f1d':
  Fix allocation count