DO NOT MERGE Keep track of method and class type variables.
am: a2bbec2d8f  -s ours

Change-Id: Id4cf4c62d07d6083d550c384dce384a8495c2d10