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

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

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst