Merge "libsnapshot: delete unused todo" am: 39fe8215e5 am: 4c199f5a28 am: 08c2d559a9

Change-Id: I2fd3909808db07fa567fb6ccb296cd84d342a24b