Merge "Fix NoSuchMethodError for getTypeInfo()"