Merge "libsnapshot: Don't compare strings for snapshot state." am: f79af03011
am: 8cbf0b9397

Change-Id: I7446ba5faf86c8b82be74a2bd700b65184fe594e