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

Change-Id: I369b2220bb42258d19fe275fd69c83a03a3c9bba