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

Change-Id: I98a894031841dfcce0f744053d4e802f78e856c1