Merge "Refactor image writer" am: 6004e14691
am: b48064e8e4

Change-Id: Ib2cad4a30d2bb76a8300353db1b266fea2225b02