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

Change-Id: I19e10b6ee077206ac408d90603345c0bde63162f