Merge "[DMAAP-DR] Patch AAF artifacts"