Merge "DMAAP MR changes"