Use public instead of var in classes

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