- Fixed class stucture issues identified by lint.
Merge remote-tracking branch 'origin/alpha' into alpha