Merge "[DMAAP] Remove AAF dependency"