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

Change-Id: Id81ce411f63c7f16b0d4765f8acad94fd493a0ad