Merge "Fix warning for redundant typedef"