Merge "Remove semicolon after class declaration"