Merge "Snapshot merge progress percentage" am: 3ddd4304f5 am: e0e4df8486

Change-Id: I4f8c4d481fd515d92477c527cf7bec18bbdc2a37