Merge "Remove import-package declaration"