Merge "Fix up getAttributeFlags() function"