Fix potential chunk leaks.
am: c7682d72e8

* commit 'c7682d72e8eeca87831dd36e09888ecd22a25f17':
  Fix potential chunk leaks.

Change-Id: Ifa721dd74a3be0da08054490155cc6898bdf811f