Merge "Fix jar host driven tests problem"