Merge "SnapshotManager::Return -> Return" am: 5e3e76520d am: f58732260d

Change-Id: Ie2916b249e3508a2382da76f4deee9a2f3c0d58f