Merge "Fix coverage build."