Merge "Make snapshotctl logging better." am: c19b08a66a

Change-Id: If7dace11f0abbd6b88e81fa06cdd0ce1c7575c5b