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

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