backport fixes to upstream

improve logging
fix progress in image deletion

Change-Id: I30c42d03a1e81307a923867e685bbe1c0ec67d6e