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

Change-Id: Iad0d71fea911db2b4a464183c977c62e63a04350