Use public instead of var in classes

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