Use public instead of var in classes

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