Add AttributeId to ProductAttributeValue
Review UT