Use public instead of var in classes

Change-Id: I06f550f3d1cf343934d453b3acebb1f5b6df2019