Merge "Track addition of Class.toGenericString() method"