Add some implicit class variables

Also removed an unused and undefined class variable.

Change-Id: Ic94b03cd8aafca33ac3d82425dde195fb10c2000
Merge "Add some implicit class variables"