Merge "Organize imports to resolve ambiguous type errors."