Fix potential chunk leaks.
am: 1ae9287a1a

* commit '1ae9287a1aec534fa0a805a717f1c4e058ae8433':
  Fix potential chunk leaks.

Change-Id: Ie509d0c936d18f09ee494303fb8f4badcbf1e92b