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

Change-Id: Id9f26977d06d877f6cddcef01eeb75efbb5ef853