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

Change-Id: I72cf11d53d31d072849a7d774f4167802817da2b