Use public instead of var in classes

Change-Id: Ic6d8f1025d43c8844ca32e34a473dbe01851bd8e
Merge "Use public instead of var in classes"