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

Change-Id: Ib5864d76c13c9581bed8a18b19c6f00a039b3e6e