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

Change-Id: I54601da5bce9acc10f69a8e9891bdd84d007b70d