Merge "Remove unit test Java version dependency"