Merge "Add more image writer comments and clean up" am: 3c58937626
am: 0500e8033c

* commit '0500e8033caf6d3456cbca2616fff72df8208ac8':
  Add more image writer comments and clean up