Use public instead of var in classes

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