Merge "TypeCode.java-remove unused imports"