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

* commit '885a570efd44bfa4e6ef78f7760903240af7a2ad':
  Address some comments in image writer