Merge "Fix jarjar-related failures in coverage tests"