Merge "Fixes incorrect flag info for the inheritance hierarchy file."