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

Change-Id: I8d357a7fb4efe8ef44d344d7a79247bd4910795d