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

* commit '50d7bd80fed6cd21a953028471880d91e0f08852':
  Clear allocator in image writer