Merge "DO NOT MERGE Keep track of method and class type variables." into nyc-mr1-dev