Merge "libsnapshot: dump rollback indicator" am: 98dc71f4ff am: 482ce8bad3

Change-Id: Ia8a8c83245e16f7c7025c25f4338d05b48c41a93