DO NOT MERGE Keep track of method and class type variables. am: 2877f75d00  -s ours am: f87f711ed5  -s ours
am: 9006032bde

Change-Id: Ic6eead9a600e11cd9743da96235d6eb9a2e65d3a