Merge "Fix -verbose:image errors"
am: 0d45ba3f47

Change-Id: I3ad741a9609efa70751bd4bbb1c408a5a68bb9fd