Merge "libsnapshot: Check for snapshot status none" am: 4711b3238e
am: 0acd392234

Change-Id: I181329b845a591b76ad6f527c05b2ca6a69aeee1