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

Change-Id: I3e3b00eb420e441bac70bf916e349013b2c3117c