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

Change-Id: I060427ffae6a9c8f310c1556e9dfdc8689deaf1f