Use public instead of var in classes

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