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

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