Merge "Add basic image writer support for app images" am: a930832a4e am: baca8c1203
am: 37df628121

* commit '37df6281215d814e477ba89de7605931fabb93e5':
  Add basic image writer support for app images