Merge "libsnapshot: refactor CreateUpdateSnapshots" am: 3edff134ef am: b1b62667cf am: a784f3cafb
am: a37b31109e

Change-Id: I5a4abcb4eb227d41cd529b7354307c6102e56086