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

Change-Id: I1981dbe41313388d808840856c243b6b21530e86