Merge "SnaspshotManager uses SnapshotMergeStats" am: beb3125d3d am: c16d61d661 am: 80ce91a5be

Change-Id: I1eab478e557cf675ed700b7041d4faa052288106