Merge "Fix sync tests failure."