Use public instead of var in classes

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