Merge "Improve ImageWriter logging."
am: 71bde0dff0

Change-Id: I19f409c4b3a3979a5dfd569cb6357886d1728ea5