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

Change-Id: I2c18d56abf9c7cca29166705d328cc08801da40e