Merge "Fix a property name that's longer than 31 chars."