Merge "Update APM XML deserializer for HAL V7"