Merge "SnaspshotManager uses SnapshotMergeStats" am: beb3125d3d

Change-Id: I1ac79aea1c1067ab0b13bc4c7095cdc9f58b4adb