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

Change-Id: I6cbdd237e73f57f5b5c71eaf1e56b37b7cfd126c