Merge "Improve ImageWriter logging." am: 71bde0dff0
am: e963320cd9

Change-Id: Ica72447b705af7f085ef19580704168dbe8dea8a