Merge "Include more cases in ImageWriter"
am: 5dcf650c18

Change-Id: Iba87738c770dd5e045ab9d1af5f581cc2a82b7fe