Merge "Update Dmaap topic"