Merge "libsnapshot: fix stats write in Resume()" am: 20d9d6a630 am: b568c330dc

Change-Id: Ica782d25b00bd75e411a7c38e210dac88397bab3