Merge "Fix for issue 3370052 : Export progress percentage is incorrect" into honeycomb