am 4ef16199: Merge "Clear allocator in image writer"

* commit '4ef16199765253bfe0ae1f02daf3b4f392d9ff67':
  Clear allocator in image writer