Merge "ErrorTypes.java-junits"