Merge "Remove unused imports in PipController"