Merge "libsnapshot: refactor CreateUpdateSnapshots"
am: 3edff134ef

Change-Id: Id5cde036c8c9dc7fe4c5328ea35a7aa7c225b698