Merge "DmaapService-removed unused imports"