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

Change-Id: I3cbdb945882918a7de9ffb9d471ffbe517413ef6