Use public instead of var in classes

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