Merge "Make snapshotctl logging better." am: c19b08a66a am: b7faf5e351 am: 2d6e47143d

Change-Id: I8fdf9714f0ec14098d976bef960f3bb909e973e3