Remove unused imports in common package

Change-Id: I51b5ef2e7e9d1877fc2d6e439b76eae05b048436
Merge "Remove unused imports in common package"