Merge "Snapshot merge progress percentage"
am: 3ddd4304f5

Change-Id: Ibf6b6bbbb3c1f11b4ece4d50e8ce18c77bdb45fd