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

Change-Id: I87cb32bec830a51dab00e31eff2157343d4b0836