Merge "Fix allocation count"
am: b25116f735

* commit 'b25116f735e00467057085c18a984aca0cc93a84':
  Fix allocation count