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

Change-Id: I74a5ae35c6e47a4ec7cf55d250d43a66ddf4f21e