Merge "SnapshotManager::WaitForMerge gives more info" am: e99ec483b1 am: 55573a3774

Change-Id: I1679594c5d9eaa1797811d5ee18aa79e494f7693