Merge "Update to latest jacoco usage"