Use public instead of var in classes

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