Merge "removed unused imports and fixed sonar issues"