Merge "Make generalizeSQL() protected"