Fixed typo in java class
Merge branch 'layout' into layout