Use public instead of var in classes

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