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

Change-Id: Ie40764c67c4c469532a28e70abfe723111c5ddc6