Merge "Fix mismatch between declaration and forward declaration"