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

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