Merge "Fixing code as part of dmaap-775"