Merge "Fix class vs. struct mismatch"