Merge "[DMAAP] change comment style"