Use public instead of var in classes

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