Merge "Address some comments in image writer"
am: 4113b97bd7

* commit '4113b97bd738570fa28a450720cf14810a9f8292':
  Address some comments in image writer