am 2b2c0cf9: Merge "Clean up image writer patching."

* commit '2b2c0cf947a4b228c9f378a3b4f281eaa2bff19a':
  Clean up image writer patching.