Merge "Include more cases in ImageWriter" am: 5dcf650c18 am: 07cbe660e4
am: ae45c67e18

Change-Id: Ib30711f42a6c5ec4912106fe58474ef2feae2fc4