Use public instead of var in classes

Change-Id: Ie408bd2516667b77114f510b19723a3a61143780