SnapshotManager::Return -> Return am: 0850bcab2b am: eae20d7b6b

Change-Id: I3519540fb6463312135a2625f766dcec22c11ac3